summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merging new release version: 1.18.11.18.11.18-seriesCory Benfield2016-10-272-1/+15
* CVE-2016-9015: Correct set verify flags.Cory Benfield2016-10-271-4/+9
* Merging new release version: 1.181.18Cory Benfield2016-09-2618-18/+204
|\
| * Merge pull request #983 from Lukasa/update-changesCory Benfield2016-09-261-2/+6
| |\
| | * Update changes for 1.18Cory Benfield2016-09-261-2/+6
| |/
| * Merge pull request #982 from Lukasa/update-changelogIan Cordasco2016-09-211-0/+2
| |\
| | * Changes for #979Cory Benfield2016-09-211-0/+2
| |/
| * Merge pull request #980 from Lukasa/issue/979Cory Benfield2016-09-202-2/+51
| |\
| | * Move to a more complex bit of idna handling.Cory Benfield2016-09-181-1/+13
| | * Tests for #979Cory Benfield2016-09-181-1/+38
| |/
| * Merge pull request #978 from nateprewitt/closed_vs_is_fp_closed_consistencyCory Benfield2016-09-133-5/+22
| |\
| | * add changelog for #978Nate Prewitt2016-09-121-0/+3
| | * changing conditional order to prefer isclosed over closedNate Prewitt2016-09-122-5/+19
| |/
| * Merge pull request #922 from Lukasa/iPAddress-SANCory Benfield2016-09-129-5/+108
| |\
| | * Merge branch 'master' into iPAddress-SANCory Benfield2016-09-124-4/+15
| | |\ | | |/ | |/|
| * | Merge pull request #976 from jonparrott/gae-pythonpath-makeCory Benfield2016-09-111-1/+1
| |\ \
| | * | Fix GAE_PYTHONPATH error in MakefileJon Wayne Parrott2016-09-101-1/+1
| * | | Merge pull request #975 from jonparrott/gae-pythonpath-makeCory Benfield2016-09-101-0/+3
| |\ \ \ | | |/ /
| | * | Error if GAE_PYTHONPATH is not set when running make test-gaeJon Wayne Parrott2016-09-101-0/+3
| |/ /
| * | Merge pull request #973 from nateprewitt/IncompleteRead_message_fixCory Benfield2016-09-103-4/+12
| |\ \
| | * | fixing incorrect message for IncompleteReadNate Prewitt2016-09-103-4/+12
| |/ /
| | * Uniform checks.Cory Benfield2016-09-101-1/+1
| | * Merge branch 'master' into iPAddress-SANCory Benfield2016-09-081-1/+1
| | |\ | | |/ | |/|
| * | Merge pull request #971 from jeremycline/docs-typo-i-thinkIan Cordasco2016-09-081-1/+1
| |\ \
| | * | Fix a typo in the user guide documentationJeremy Cline2016-09-081-1/+1
| |/ /
| | * Try updating setuptools.Cory Benfield2016-09-081-0/+1
| | * Add ipaddress marker to setup.cfg.Cory Benfield2016-09-081-0/+1
| | * Revert "Vendor a backport of the ipaddress module."Cory Benfield2016-09-081-2209/+0
| | * Revert "Fallback to the vendored ipaddress module."Cory Benfield2016-09-081-6/+6
| | * Revert "Remove ipaddress marker."Cory Benfield2016-09-081-0/+3
| | * Merge branch 'master' into iPAddress-SANCory Benfield2016-09-0834-329/+671
| | |\ | | |/ | |/|
| | * Add a cert with IP SAN and test for it.Cory Benfield2016-07-113-1/+38
| | * Remove ipaddress marker.Cory Benfield2016-07-111-3/+0
| | * Favour our own match_hostname over old versions.Cory Benfield2016-07-111-1/+7
| | * Fallback to the vendored ipaddress module.Cory Benfield2016-07-111-6/+6
| | * Vendor a backport of the ipaddress module.Cory Benfield2016-07-111-0/+2209
| | * Changes for #258.Cory Benfield2016-07-111-0/+3
| | * Have the 'secure' flag install ipaddress.Cory Benfield2016-07-111-0/+3
| | * Backport Python 3.5 match_hostname function.Cory Benfield2016-07-111-3/+55
* | | Merging new release version: 1.17Cory Benfield2016-09-0662-1536/+2199
|\ \ \ | |/ /
| * | Merge pull request #969 from Lukasa/setupcfg-is-my-nemesisCory Benfield2016-09-061-1/+1
| |\ \
| | * | Don't forget setup.cfgCory Benfield2016-09-061-1/+1
| |/ /
| * | Merge pull request #968 from Lukasa/changes/cut-1.17Cory Benfield2016-09-061-2/+6
| |\ \
| | * | Update changes for 1.17Cory Benfield2016-09-061-2/+6
| |/ /
| * | Merge pull request #964 from Lukasa/blacklist-pysocks-157Cory Benfield2016-09-061-1/+1
| |\ \
| | * \ Merge branch 'master' into blacklist-pysocks-157Cory Benfield2016-09-066-20/+26
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #967 from Lukasa/springjools-masterCory Benfield2016-09-052-7/+10
| |\ \ \
| | * | | Fixup some whitespace.Cory Benfield2016-09-051-2/+2
| | * | | Add changelog for #967.Cory Benfield2016-09-051-0/+3
| | * | | Merge branch 'master' of https://github.com/springjools/urllib3 into springjo...Cory Benfield2016-09-051-5/+5
| | |\ \ \ | |/ / / /