summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #454 from hynek/master16.0.0Cory Benfield2016-03-192-2/+2
|\
| * Prepare 16.0.0Hynek Schlawack2016-03-192-2/+2
|/
* Merge pull request #453 from hynek/masterCory Benfield2016-03-194-46/+55
|\
| * BraaaaandHynek Schlawack2016-03-191-1/+1
| * Fix some links and markupHynek Schlawack2016-03-193-39/+37
| * Some README polishingHynek Schlawack2016-03-191-7/+18
|/
* Merge pull request #422 from hynek/set_session_idPaul Kehrer2016-03-187-54/+186
|\
| * cryptography 1.3 is here!Hynek Schlawack2016-03-181-1/+1
| * Fix changelogHynek Schlawack2016-03-161-2/+2
| * Fix cryptography minimum versionHynek Schlawack2016-03-163-9/+10
| * Implement Context.set_session_idHynek Schlawack2016-03-164-44/+175
* | Merge pull request #451 from reaperhulk/no-crypto-freeHynek Schlawack2016-03-181-1/+1
|\ \
| * | switch to OPENSSL_freePaul Kehrer2016-03-171-1/+1
| |/
* | Merge pull request #452 from reaperhulk/no-remove-thread-stateHynek Schlawack2016-03-181-2/+2
|\ \
| * | swap ERR_remove_thread_state for ERR_clear_errorPaul Kehrer2016-03-171-2/+2
| |/
* | Merge pull request #450 from hynek/masterPaul Kehrer2016-03-172-2/+58
|\ \ | |/ |/|
| * Adopt CoC CovenantHynek Schlawack2016-03-172-2/+58
|/
* Merge pull request #449 from pyca/alex-patch-1Hynek Schlawack2016-03-163-14/+9
|\
| * BumpAlex Gaynor2016-03-161-6/+6
| * Update these jobsAlex Gaynor2016-03-161-2/+2
| * Remove code for pre-cryptography 1.2Alex Gaynor2016-03-161-6/+1
|/
* Merge pull request #448 from hynek/masterAlex Gaynor2016-03-161-2/+2
|\
| * Use PyPy 5.0.0Hynek Schlawack2016-03-161-2/+2
|/
* Merge pull request #446 from Lukasa/test-urllib3Hynek Schlawack2016-03-163-1/+26
|\
| * We don't need the whole history.Cory Benfield2016-03-161-1/+1
| * Whitelist rmCory Benfield2016-03-141-0/+2
| * Use urllib3's dev-requirements where possible.Cory Benfield2016-03-142-3/+1
| * Smoke test for urllib3.Cory Benfield2016-03-143-1/+26
|/
* Merge pull request #444 from hynek/state_stringPaul Kehrer2016-03-144-9/+7
|\
| * Rename state_name to get_state_nameHynek Schlawack2016-03-144-9/+7
|/
* Merge pull request #445 from hynek/headerPaul Kehrer2016-03-142-2/+12
|\
| * Move conftest.py into testsHynek Schlawack2016-03-142-1/+1
| * Print library versions the proper wayHynek Schlawack2016-03-143-3/+13
|/
* Merge pull request #443 from hynek/changelogPaul Kehrer2016-03-135-25/+40
|\
| * De-Sphinx CHANGELOG & add rel info to descriptionHynek Schlawack2016-03-135-25/+40
|/
* Merge pull request #440 from hynek/examplesPaul Kehrer2016-03-1312-102/+182
|\
| * Polish up examples (somewhat)Hynek Schlawack2016-03-1312-102/+182
* | Merge pull request #442 from hynek/more-422Paul Kehrer2016-03-135-11/+18
|\ \
| * | Pluck more unrelated bits from #422Hynek Schlawack2016-03-135-11/+18
|/ /
* | Merge pull request #441 from hynek/deprecate-2.6Cory Benfield2016-03-131-3/+4
|\ \ | |/ |/|
| * Deprecate Python 2.6Hynek Schlawack2016-03-131-3/+4
|/
* Merge pull request #433 from reaperhulk/opaque-x509-extAlex Gaynor2016-03-112-7/+76
|\
| * move to separate pytest class + add one more test casePaul Kehrer2016-03-111-12/+26
| * what's a bytesPaul Kehrer2016-03-111-1/+1
| * first revoked cert in the CRL has NID_crl_reason first in listPaul Kehrer2016-03-111-2/+2
| * add a test to confirm crl.get_reason ignores unsupported extensionsPaul Kehrer2016-03-111-0/+50
| * treat x509 extension objects as opaque pointersPaul Kehrer2016-03-111-6/+11
* | Merge pull request #437 from hynek/fix-set_cipher_list-modern-opensslPaul Kehrer2016-03-117-75/+79
|\ \ | |/ |/|
| * Assert against True explicitlyHynek Schlawack2016-03-111-1/+1
| * More explicit assertHynek Schlawack2016-03-111-1/+1