Merge pull request #1845 from Lukasa/proxy_bypass
authorKenneth Reitz <me@kennethreitz.org>
Wed, 8 Jan 2014 18:51:08 +0000 (10:51 -0800)
committerKenneth Reitz <me@kennethreitz.org>
Wed, 8 Jan 2014 18:51:08 +0000 (10:51 -0800)
commitb17cad65cf27646f0680954914ab31abd4f626c9
treeeef4fa286f245dfd1c820984b2c4a5c2f1b079f4
parenta855ba81895424b3d716569560650f3f7cafe15a
parente2a36dda0a4bd0b09d76fe6bf30e6fca4d2822ca
Merge pull request #1845 from Lukasa/proxy_bypass

Resolve proxy_bypass problems.