summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2022-03-18 17:03:36 -0400
committerJeff Forcier <jeff@bitprophet.org>2022-03-18 17:03:36 -0400
commit361a60d44a00e469d8ff6e84519ae5afcbaa7e9f (patch)
treef920d4cb4d080126ad8086ca2a01772e4e245773
parent6b31705174d79608d4308a36771dc0b7fbc2acd0 (diff)
parent239d2bd7a620be5cdaaa26f981ea72f5f55c9050 (diff)
downloadparamiko-361a60d44a00e469d8ff6e84519ae5afcbaa7e9f.tar.gz
Merge branch '2.10'
-rw-r--r--paramiko/_version.py2
-rw-r--r--sites/www/changelog.rst2
2 files changed, 3 insertions, 1 deletions
diff --git a/paramiko/_version.py b/paramiko/_version.py
index b14b6865..82bc1161 100644
--- a/paramiko/_version.py
+++ b/paramiko/_version.py
@@ -1,2 +1,2 @@
-__version_info__ = (2, 10, 2)
+__version_info__ = (2, 10, 3)
__version__ = ".".join(map(str, __version_info__))
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 0b669c55..067a73ba 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
Changelog
=========
+- :release:`2.10.3 <2022-03-18>`
+- :release:`2.9.3 <2022-03-18>`
- :bug:`1963` (via :issue:`1977`) Certificate-based pubkey auth was
inadvertently broken when adding SHA2 support; this has been fixed. Reported
by Erik Forsberg and fixed by Jun Omae.