summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2019-06-09 20:59:16 -0400
committerJeff Forcier <jeff@bitprophet.org>2019-06-09 20:59:16 -0400
commit6ae44f4c69f07dee0d0e686dc1343dcc2d6f0e76 (patch)
treea5cb2ebf820ecbe30b7c2638493bc248c3497171
parent0197b7acebd45631a60cc87ae1c6042b5311709d (diff)
Cut 2.5.0
-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 2e797d40..2916a60a 100644
--- a/paramiko/_version.py
+++ b/paramiko/_version.py
@@ -1,2 +1,2 @@
-__version_info__ = (2, 4, 2)
+__version_info__ = (2, 5, 0)
__version__ = ".".join(map(str, __version_info__))
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 5ad24034..41c50ce5 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
Changelog
=========
+- :release:`2.5.0 <2019-06-09>`
- :feature:`1233` (also :issue:`1229`, :issue:`1332`) Add support for
encrypt-then-MAC (ETM) schemes (``hmac-sha2-256-etm@openssh.com``,
``hmac-sha2-512-etm@openssh.com``) and two newer Diffie-Hellman group key