summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2019-06-23 18:46:57 -0400
committerJeff Forcier <jeff@bitprophet.org>2019-06-23 18:46:57 -0400
commit169a40be1af4fbb16dce0ca31367abc0dd3d9ebd (patch)
treee14d6e1410473d3d03e48c2e88945d8dc20bcb88
parentc1f1f52370a2c0143edcba2f75dec70faf83cc8f (diff)
downloadparamiko-169a40be1af4fbb16dce0ca31367abc0dd3d9ebd.tar.gz
Cut 2.5.12.5.1
-rw-r--r--paramiko/_version.py2
-rw-r--r--sites/www/changelog.rst1
2 files changed, 2 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 928a0f22..b83a83df 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
Changelog
=========
+- :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