summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2018-10-08Merge branch '2.3' into 2.4Jeff Forcier
2018-10-08Merge branch '2.2' into 2.3Jeff Forcier
2018-10-08Merge branch '2.1' into 2.2Jeff Forcier
2018-10-08Merge branch '2.0' into 2.1Jeff Forcier
2018-10-08Finally got a CVE re #1283Jeff Forcier
2018-09-18Merge branch '2.3' into 2.4Jeff Forcier
2018-09-18Merge branch '2.2' into 2.3Jeff Forcier
2018-09-18Merge branch '2.1' into 2.2Jeff Forcier
2018-09-18Merge branch '2.0' into 2.1Jeff Forcier
2018-09-18MehJeff Forcier
2018-09-18Cut 2.4.2Jeff Forcier
2018-09-18Merge branch '2.3' into 2.4Jeff Forcier
2018-09-18Cut 2.3.3Jeff Forcier
2018-09-18Merge branch '2.2' into 2.3Jeff Forcier
2018-09-18Cut 2.2.4Jeff Forcier
2018-09-18Merge branch '2.2' into 2.3Jeff Forcier
2018-09-18Merge branch '2.1' into 2.2Jeff Forcier
2018-09-18Cut 2.1.6Jeff Forcier
2018-09-18Merge branch '2.0' into 2.1Jeff Forcier
2018-09-18Cut 2.0.9Jeff Forcier
2018-09-18Almost left the 1.17+ marker in the changelog.Jeff Forcier
Would not necessarily have caused issues but hey
2018-09-18Merge branch '2.3' into 2.4Jeff Forcier
2018-09-18Merge branch '2.2' into 2.3Jeff Forcier
2018-09-18Merge branch '2.1' into 2.2Jeff Forcier
2018-09-18Merge branch '2.0' into 2.1Jeff Forcier
2018-09-18Fix a Python 2.6 oopsJeff Forcier
2018-09-18Merge branch '2.3' into 2.4Jeff Forcier
2018-09-18Merge branch '2.2' into 2.3Jeff Forcier
2018-09-18Merge branch '2.1' into 2.2Jeff Forcier
2018-09-18Merge branch '2.0' into 2.1Jeff Forcier
2018-09-18FormattingJeff Forcier
2018-09-18Merge branch '2.3' into 2.4Jeff Forcier
2018-09-18Merge branch '2.2' into 2.3Jeff Forcier
2018-09-18Merge branch '2.1' into 2.2Jeff Forcier
2018-09-18Merge branch '2.0' into 2.1Jeff Forcier
2018-09-18Fix and changelog re #1283Jeff Forcier
2018-09-18Fix a pseudo-bug re: responding to MSG_UNIMPLEMENTED w/ itselfJeff Forcier
2018-09-18Merge branch '2.3' into 2.4Jeff Forcier
2018-09-18Pseudo-merge travis-CI changes re #1292 from 2.2 branchJeff Forcier
2018-09-18Merge branch '2.3' into 2.4Jeff Forcier
2018-09-18Stars to dashes, 2.4 editionJeff Forcier
2018-09-18Pull in changelog re #1292Jeff Forcier
Rest of merge was resolved with '-s ours' to keep those changes back on the old branches only.
2018-09-18Merge branch '2.2' into 2.3Jeff Forcier
2018-09-18Merge branch '2.1' into 2.2Jeff Forcier
2018-09-18Merge branch '2.0' into 2.1Jeff Forcier
2018-09-18Merge branch 'crypto-1.5-agnostisicm' into 2.0Jeff Forcier
2018-09-18Missing verbose/color for 2.6/3.3 backported pytest setupJeff Forcier
Should be hitting all tests, including slow tests, by default still tho
2018-09-18Backport support for newer cryptography sign/verify APIs.Jeff Forcier
Implements #1292.
2018-09-18Try testing against different cryptography.io versionsJeff Forcier
2018-09-17Minor cleanupJeff Forcier