summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2019-12-09 18:21:11 -0500
committerJeff Forcier <jeff@bitprophet.org>2019-12-09 18:21:11 -0500
commit8019623a88481f897602e66d94e65b822c17a0c9 (patch)
treed718b485a6989b882bcc5c9d4dfdb946fdc16dc9
parent2e6d0a414c879341b1d9c9ee7047e37272c9a3bd (diff)
parent690d142321f53ae82f49a57b7f6716fb947d5687 (diff)
Merge branch '2.7'
-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 1ea09a77..7116636e 100644
--- a/paramiko/_version.py
+++ b/paramiko/_version.py
@@ -1,2 +1,2 @@
-__version_info__ = (2, 7, 0)
+__version_info__ = (2, 7, 1)
__version__ = ".".join(map(str, __version_info__))
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 8863f32d..f7eefa08 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
Changelog
=========
+- :release:`2.7.1 <2019-12-09>`
- :bug:`1567` The new-style private key format (added in 2.7) suffered from an
unpadding bug which had been fixed earlier for Ed25519 (as that key type has
always used the newer format). That fix has been refactored and applied to