summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2014-02-14Merge branch '1.12'Jeff Forcier
2014-02-14Merge branch '1.11' into 1.12Jeff Forcier
Conflicts: paramiko/hostkeys.py sites/www/changelog.rst
2014-02-14Merge branch '1.10' into 1.11Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-02-14Changelog re hash comparison bugfixJeff Forcier
2014-02-14Use constant time hash comparisons for improved security.Jeff Forcier
See e.g. http://codahale.com/a-lesson-in-timing-attacks/ Mega thanks to Alex Gaynor for the original patch.
2014-02-14Merge branch '1.12'Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-02-14Cut 1.12.2Jeff Forcier
2014-02-14Merge branch '1.11' into 1.12Jeff Forcier
Conflicts: paramiko/__init__.py setup.py
2014-02-14Cut 1.11.4Jeff Forcier
2014-02-14Merge branch '1.10' into 1.11Jeff Forcier
Conflicts: paramiko/__init__.py setup.py sites/www/changelog.rst
2014-02-14Cut 1.10.6Jeff Forcier
2014-02-14Merge branch '1.12'Jeff Forcier
2014-02-14Merge branch '1.11' into 1.12Jeff Forcier
2014-02-14Catch & patch trimmingJeff Forcier
2014-02-14Merge branch '1.12'Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-02-14Merge branch '1.11' into 1.12Jeff Forcier
2014-02-14Tweak changelog languageJeff Forcier
2014-02-13Braino in changelog textJeff Forcier
2014-02-13Don't raise timeouts as ProxyCommand failures, thanks @mgedminJeff Forcier
2014-02-13Don't drop/lose data when our inner timeout goges off.Jeff Forcier
2014-02-13Slightly safer socket.error handlingJeff Forcier
2014-02-13I hate you sometimes, ReSTJeff Forcier
2014-02-13Preliminary changelog entry re #252Jeff Forcier
2014-02-13Changelog re #268Jeff Forcier
2014-02-13Fix NameError in error-handling caseMarius Gedminas
Fixes #268
2014-02-12Potentially horrible attempt at manual subprocess-read timeoutsJeff Forcier
2014-02-12Nuke old merge mistake (or what looks like one anyway.)Jeff Forcier
2014-02-11Merge branch '1.12'Jeff Forcier
2014-02-11Merge branch '1.11' into 1.12Jeff Forcier
2014-02-11Merge branch '1.10' into 1.11Jeff Forcier
2014-02-11Merge branch 'banner-functionality'Jeff Forcier
2014-02-11Changelog re #58Jeff Forcier
2014-02-11Not a fan of pointless getters.Jeff Forcier
2014-02-11FormattingJeff Forcier
2014-02-11Adding banner functionalityJohan Prins
2014-02-11Bump to releases bugfixJeff Forcier
2014-02-11Merge branch '1.12'Jeff Forcier
2014-02-11Merge branch '1.11' into 1.12Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-02-11Merge branch '1.10' into 1.11Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-02-11Start reverting explicit-release stuff in favor of release-line specifiers ↵Jeff Forcier
on bugs.
2014-02-11Merge branch '1.10' into 1.11Jeff Forcier
2014-02-11Add coverage command as Invoke taskJeff Forcier
2014-02-11Clean up a list-comp (also fixes race condition)Jeff Forcier
2014-02-10Herp and a derpJeff Forcier
2014-02-10WhitespaceJeff Forcier
2014-02-10Future import for with: under py25Jeff Forcier
2014-02-10Replace incorrect import of generic test runner w/ custom taskJeff Forcier
2014-02-10Merge remote-tracking branch 'ewxrjk/issue34' into sftp-reordering-34Jeff Forcier
2014-02-10Changelog re #35Jeff Forcier
2014-02-10Fix extra colon in changelogJeff Forcier