summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2017-07-13Merge branch '2.2'Jeff Forcier
2017-07-13Changelog re #1012, re #1016Jeff Forcier
2017-07-13Merge branch '2.2'Jeff Forcier
2017-07-13Enhance SFTP client & server docs re: posix_rename and its relation to renameJeff Forcier
Fixes #1016, re #1012
2017-06-15Merge branch '2.2'Jeff Forcier
2017-06-15Merge branch '2.1' into 2.2Jeff Forcier
2017-06-15Merge branch '2.0' into 2.1Jeff Forcier
2017-06-15Merge pull request #997 from ploxiln/travis_pypy_updateJeff Forcier
travis-ci: update pypy test run
2017-06-14travis-ci: update pypy test run to use pypy-5.6.0Pierce Lopez
2017-06-13Merge branch '2.2'Jeff Forcier
2017-06-13Cut 2.2.1Jeff Forcier
2017-06-13Merge branch '2.2'Jeff Forcier
2017-06-13WhitespaceJeff Forcier
2017-06-13Changelog language tweaksJeff Forcier
2017-06-13changelog: update for #990 and #993Pierce Lopez
2017-06-13implement __hash__() method for Ed25519KeyPierce Lopez
makes Ed25519Key objs comparable, needed for host keys
2017-06-13need bcrypt >= 3.1.3 for kdf() ignore_few_rounds kwargPierce Lopez
2017-06-12Merge branch '2.2'Jeff Forcier
2017-06-12Merge branch '2.1' into 2.2Jeff Forcier
2017-06-12Merge branch '2.0' into 2.1Jeff Forcier
2017-06-12Add Python 3.6 to classifiersFelix Yan
2017-06-12Merge pull request #991 from felixonmars/patch-1Jeff Forcier
Add Python 3.6 to classifiers
2017-06-11Add Python 3.6 to classifiersFelix Yan
2017-06-09Cut 2.2.0Jeff Forcier
2017-06-09Merge branch '2.1'Jeff Forcier
2017-06-09Cut 2.1.3Jeff Forcier
2017-06-09Merge branch '2.0' into 2.1Jeff Forcier
2017-06-09Cut 2.0.6Jeff Forcier
2017-06-09Copy 1.x releases to 2.x changelogJeff Forcier
2017-06-09Merge branch '2.1'Jeff Forcier
2017-06-09Clarification language re #865 changelogJeff Forcier
2017-06-09Merge branch '2.1'Jeff Forcier
2017-06-09Re-apply ResourceManager removalJeff Forcier
2017-06-09Merge branch '2.1' into 910-intJeff Forcier
2017-06-09Merge branch '2.1'Jeff Forcier
2017-06-09Merge branch '2.0' into 2.1Jeff Forcier
2017-06-09Port #906 changelog to 2.0 re #976Jeff Forcier
2017-06-09Merge branch '2.0' into 976-intJeff Forcier
2017-06-09Merge branch 'master' into 984-intJeff Forcier
2017-06-09Merge branch '2.0' into 2.1Jeff Forcier
2017-06-09Merge branch '2.1'Jeff Forcier
2017-06-09Hand-port #984 to 2.0Jeff Forcier
2017-06-09Merge branch '2.0' into 2.1Jeff Forcier
2017-06-09Merge branch '2.1'Jeff Forcier
2017-06-09Merge branch '2.0' into 976-intJeff Forcier
2017-06-09Merge branch '2.1'Jeff Forcier
2017-06-09Merge branch '2.0' into 2.1Jeff Forcier
2017-06-09Port #971 changelog from 1.x to 2.xJeff Forcier
2017-06-09Flake8/etc tweaks re #971 in 2.xJeff Forcier
2017-06-09Tweak comments as suggested in reviewMartin Packman
Thanks to bitprophet and ploxiln.