summaryrefslogtreecommitdiffhomepage
AgeCommit message (Expand)Author
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
2017-06-09Allow any buffer type to be written to SFTPFileMartin Packman
2017-06-09Allow any buffer type to be sent to ChannelMartin Packman
2017-06-09Import from py3compat directly in test_clientMartin Packman
2017-06-09Allow any buffer type to written to BufferedFileMartin Packman
2017-06-09Add new skipUnlessBuiltin function for testingMartin Packman
2017-06-09More changelog flimflammeryJeff Forcier
2017-06-09Merge branch '2.1'Jeff Forcier
2017-06-09Merge branch '2.0' into 2.1Jeff Forcier
2017-06-09Unify 1.x and 2.x changelog entries.Jeff Forcier
2017-06-09Merge branch '2.1'Jeff Forcier
2017-06-09Merge branch '2.0' into 2.1Jeff Forcier
2017-06-09Changelog re #956Jeff Forcier
2017-06-09Replace coveralls with codecov, comments disabledNikolai R Kristiansen
2017-06-09Merge branch '2.1'Jeff Forcier
2017-06-09Merge branch '2.0' into 2.1Jeff Forcier
2017-06-09Merge branch '2.0' into 952-intJeff Forcier
2017-06-07Merge pull request #988 from ploxiln/auth_timeout_tests_cleanupJeff Forcier
2017-06-07cleanup/simplify auth_timeout testsPierce Lopez
2017-06-06Missed a merge conflict lololJeff Forcier
2017-06-06Merge branch '2.1'Jeff Forcier
2017-06-06Merge branch '2.0' into 2.1Jeff Forcier
2017-06-06Hand-picked backport of #912, fixes #741Jeff Forcier
2017-06-06sphinx nitpick fixesJeff Forcier
2017-06-06flake8Jeff Forcier
2017-06-06Add sanity note to changelog re #869Jeff Forcier
2017-06-06Changelog re #471, re #65Jeff Forcier
2017-06-06Merge branch 'master' into 471-intJeff Forcier
2017-06-06Changelog tweakJeff Forcier
2017-06-06Trailing commaJeff Forcier
2017-06-06flake8/whitespaceJeff Forcier
2017-06-06Merge branch 'master' into 869-intJeff Forcier
2017-06-06Changelog re #921Jeff Forcier
2017-06-06Merge branch 'master' into 921-intJeff Forcier
2017-06-06Note ecdh-sha2 preferred-kex placement in changelog entry for #951, re #983Jeff Forcier
2017-06-06Merge branch 'master' into 983-intJeff Forcier
2017-06-06Merge branch '2.1'Jeff Forcier
2017-06-06Merge branch '2.0' into 2.1Jeff Forcier
2017-06-06Partially apply #983 for 2.0+Jeff Forcier
2017-06-06Merge branch 'master' into 983-intJeff Forcier
2017-06-06Merge branch '2.1'Jeff Forcier
2017-06-06Merge branch '2.0' into 2.1Jeff Forcier
2017-06-06Partially apply #983 for 2.0+Jeff Forcier
2017-06-06transport: change order of preferred kex and hmac algorithmsPierce Lopez
2017-06-06Merge branch '2.1'Jeff Forcier
2017-06-06Merge branch '2.0' into 2.1Jeff Forcier