handle urllib3 api changes; closes #2045
Merge pull request #2153 from jschneier/master

handle urllib3 api changes; closes #2045