summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merging new release version: 1.141.14Andrey Petrov2015-12-2923-49/+935
|\
| * CHANGES for v1.14Andrey Petrov2015-12-291-2/+6
| * CHANGES for #762Andrey Petrov2015-12-281-0/+2
| * Merge pull request #770 from scop/travisAndrey Petrov2015-12-264-3/+8
| |\
| | * Spelling fixVille Skyttä2015-12-271-1/+1
| | * Add Python 3.5 to TravisVille Skyttä2015-12-273-2/+7
| * | Merge pull request #769 from scop/masterAndrey Petrov2015-12-263-2/+5
| |\ \ | | |/
| | * Vanity update.Ville Skyttä2015-12-261-0/+3
| | * Spelling fixes.Ville Skyttä2015-12-262-2/+2
| |/
| * Merge pull request #767 from scop/loggingAndrey Petrov2015-12-266-27/+26
| |\
| | * Let logger format messages on demandVille Skyttä2015-12-266-27/+26
| |/
| * CHANGES for #763Andrey Petrov2015-12-241-0/+3
| * Merge pull request #763 from mikelambert/masterAndrey Petrov2015-12-241-1/+9
| |\
| | * Fixes the AppEngineManager logic, but leaves the API alone.Mike Lambert2015-12-241-35/+3
| | * # This is a combination of 2 commits.Mike Lambert2015-12-241-4/+44
| * | Merge pull request #765 from wolfgang42/patch-1Andrey Petrov2015-12-221-3/+5
| |\ \
| | * | docs/security: Upgrading ndg-httpsclientWolfgang2015-12-221-3/+5
| |/ /
| * | Merge pull request #762 from Lukasa/lukasa/socksAndrey Petrov2015-12-1912-13/+873
| |\ \
| | * | Remove check for existence.Cory Benfield2015-12-192-2/+3
| | * | Re-hoist pool_classes_by_schemeCory Benfield2015-12-191-5/+9
| | * | Mention -UCory Benfield2015-12-191-0/+6
| | * | SOCKS added in 1.14Cory Benfield2015-12-191-0/+2
| | * | Warn if missing PySocks.Cory Benfield2015-12-192-1/+22
| | * | Or require third party dependenciesCory Benfield2015-12-192-2/+2
| | * | Consistent variable names.Cory Benfield2015-12-191-2/+2
| | * | Document SOCKS proxy support.Cory Benfield2015-12-181-2/+48
| | * | Rename module to socksCory Benfield2015-12-172-15/+17
| | * | Test SOCKS works properly with TLSCory Benfield2015-12-171-0/+61
| | * | Allow using the `server_side` flag for fallback wrap_socketCory Benfield2015-12-171-1/+2
| | * | Clearup unused import.Cory Benfield2015-12-161-1/+1
| | * | Test source_address works with SOCKS proxies.Cory Benfield2015-12-161-0/+46
| | * | Omit verified/unverified logic from socks proxyCory Benfield2015-12-161-8/+5
| | * | Add defensive pragmaCory Benfield2015-12-161-1/+1
| | * | Include socks_proxy.py in coverage.Cory Benfield2015-12-161-1/+3
| | * | Use more obvious test domain.Cory Benfield2015-12-161-12/+12
| | * | We support SOCKS4 and SOCKS5Cory Benfield2015-12-161-1/+3
| | * | Remove extra blank lineCory Benfield2015-12-161-1/+0
| | * | Tests for the SOCKS contrib module.Cory Benfield2015-12-162-0/+493
| | * | Add support for IPv4-only tests.Cory Benfield2015-12-162-1/+19
| | * | Wrap errors from the socks lib.Cory Benfield2015-12-161-3/+22
| | * | Document IPv4 limitations.Cory Benfield2015-12-161-0/+7
| | * | Remove excess blank line.Cory Benfield2015-12-151-1/+0
| | * | Add SOCKS support via contrib module.Cory Benfield2015-12-153-6/+140
* | | | Merging new release version: 1.13.11.13.1Andrey Petrov2015-12-189-6/+97
|\ \ \ \ | |/ / /
| * | | CHANGES for v1.13.1Andrey Petrov2015-12-181-2/+6
| | |/ | |/|
| * | CHANGES for #761Andrey Petrov2015-12-151-0/+2
| * | Merge pull request #761 from Lukasa/issue/760Andrey Petrov2015-12-156-3/+89
| |\ \ | | |/ | |/|
| | * Better explanation.Cory Benfield2015-12-151-3/+5
| | * Explain what the fix for #760 is doing.Cory Benfield2015-12-151-0/+5
| | * Test fix for #760.Cory Benfield2015-12-151-2/+20