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-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
2017-06-06Changelog re #667Jeff Forcier
2017-06-06Merge branch '2.0' into 667-intJeff Forcier
2017-06-06Changelog re #857Jeff Forcier
2017-06-06That was easy. Closes #857Jeff Forcier
2017-06-06DDD re #857Jeff Forcier
2017-06-06Failing test proving need for #857Jeff Forcier
2017-06-06Changelog re #951Jeff Forcier
2017-06-06Trailing commaJeff Forcier
2017-06-06flake8Jeff Forcier
2017-06-06Merge branch 'master' into 951-intJeff Forcier
2017-06-05Merge branch '2.1'Jeff Forcier
2017-06-052.1-specific broken sphinx refsJeff Forcier
2017-06-05Merge branch '2.1'Jeff Forcier
2017-06-05Merge branch '2.0' into 2.1Jeff Forcier
2017-06-05No idea how this fancy quote got in here or why it wasn't causing barfs priorJeff Forcier
2017-06-05Merge branch '2.1'Jeff Forcier
2017-06-05Merge branch '2.0' into 2.1Jeff Forcier
2017-06-05Changelog because I deserve itJeff Forcier