Merge branch '2.10' into 2.11

sites/www/changelog.rst

@@ -9,11 +9,11 @@
   errors (though we hasten to remind everyone that Client and Transport have
   their own ``.close()`` methods for use in non-error situations!). Patch
   courtesy of ``@YoavCohen``.
-- bug:`1637` (via :issue:`1599`) Raise `SSHException` explicitly when blank
-  private key data is loaded, instead of the natural result of ``IndexError``.
-  This should help more bits of Paramiko or Paramiko-adjacent codebases to
-  correctly handle this class of error. Credit: Nicholas Dietz.
-- :release:`2.11.0 <2022-05-16>`
+- bug:`1637` (via :issue:`1599`) Raise `~paramiko.ssh_exception.SSHException`
+  explicitly when blank private key data is loaded, instead of the natural
+  result of ``IndexError``. This should help more bits of Paramiko or
+  Paramiko-adjacent codebases to correctly handle this class of error. Credit:
+  Nicholas Dietz.
 - :release:`2.10.5 <2022-05-16>`
 - :release:`2.9.5 <2022-05-16>`
 - :bug:`1933` Align signature verification algorithm with OpenSSH re: