Don't repopulate proxies if we don't trust the env.
Merge pull request #2021 from Lukasa/proxies2

Don't repopulate proxies if we don't trust the environment.