From: Kenneth Reitz <me@kennethreitz.com>
Date: Fri, 4 Oct 2013 06:14:26 +0000 (-0700)
Subject: Merge pull request #1651 from GrahamDumpleton/master
X-Git-Tag: v2.0.1~13^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c9bee155c2453f0059daed7f4b7c65372a5d46f5;p=services%2Fpython-requests.git

Merge pull request #1651 from GrahamDumpleton/master

Translate urllib3 ProxyError into a requests ProxyError derived from ConnectionError.
---

c9bee155c2453f0059daed7f4b7c65372a5d46f5