Merge pull request #2021 from Lukasa/proxies2
authorKenneth Reitz <me@kennethreitz.org>
Mon, 28 Apr 2014 21:49:27 +0000 (17:49 -0400)
committerKenneth Reitz <me@kennethreitz.org>
Mon, 28 Apr 2014 21:49:27 +0000 (17:49 -0400)
Don't repopulate proxies if we don't trust the environment.


Trivial merge