Subject: Update Conda

From: Ricardo Wurmus <[email-masked]>
Date: Thu, 13 Aug 2020 00:07:29 +0200

Commit 638ef1e81d upgrades Conda to 4.8.3.  This makes these patches
obsolete.

What a nightmare this was!

-- 
Ricardo