Merge pull request #1515 from schlamar/https-proxy-2.0
authorKenneth Reitz <me@kennethreitz.com>
Wed, 14 Aug 2013 20:41:08 +0000 (13:41 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 14 Aug 2013 20:41:08 +0000 (13:41 -0700)
commitd8268fb7b44da7b8aa225eb1ca6fbdb4f9dc2457
treeca8063ab7db7d2004a33c58b884f47d9937ce12a
parentd3b786399e1a1041426cd6ab6a619b58a86d6300
parent2e5a6746019140bf2ef3a497c30c17992de36426
Merge pull request #1515 from schlamar/https-proxy-2.0

[2.0] Https proxy support