diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2019-06-23 18:47:47 -0400 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2019-06-23 18:47:47 -0400 |
| commit | a87eee61d2c5d5503f542a1221d1ae6e0a2e7233 (patch) | |
| tree | fab2051e94e7a460640bae76519a7c768f9e0793 | |
| parent | a829c432f679ff13554729569be3e4237c3e4cef (diff) | |
| parent | 169a40be1af4fbb16dce0ca31367abc0dd3d9ebd (diff) | |
| download | paramiko-a87eee61d2c5d5503f542a1221d1ae6e0a2e7233.tar.gz | |
Merge branch '2.5'
| -rw-r--r-- | paramiko/_version.py | 2 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/paramiko/_version.py b/paramiko/_version.py index 2916a60a..d5dbcad8 100644 --- a/paramiko/_version.py +++ b/paramiko/_version.py @@ -1,2 +1,2 @@ -__version_info__ = (2, 5, 0) +__version_info__ = (2, 5, 1) __version__ = ".".join(map(str, __version_info__)) diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 9e9275f6..2e327ab1 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -8,6 +8,8 @@ Changelog kex/key/cipher/etc algorithms. This can be useful when disabling algorithms your target server (or client) does not support cleanly, or to work around unpatched bugs in Paramiko's own implementation thereof. +- :release:`2.5.1 <2019-06-23>` +- :release:`2.4.3 <2019-06-23>` - :bug:`1306` (via :issue:`1400`) Fix Ed25519 key handling so certain key comment lengths don't cause ``SSHException("Invalid key")`` (this was technically a bug in how padding, or lack thereof, is |