summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2018-09-18 21:18:35 -0700
committerJeff Forcier <jeff@bitprophet.org>2018-09-18 21:18:35 -0700
commitc2fe70eb72b7a265f8363344e06247aebe95e0c1 (patch)
tree608f9ef65e7e79b816a3953e52f8be0f0d53cd1d
parentdd551fcd6d9fec3f0f5b981c5e04e9c464a2da68 (diff)
parent255568dde3f3783994a0c606ddfde0448ad5954d (diff)
Merge branch '2.1' into 2.2
-rw-r--r--sites/www/changelog.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 515392fc..9d83bf0c 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -6,9 +6,9 @@ Changelog
- :release:`2.1.6 <2018-09-18>`
- :release:`2.0.9 <2018-09-18>`
- :bug:`-` Modify protocol message handling such that ``Transport`` does not
- respond to ``MSG_UNIMPLEMENTED`` with its own ``MSG_UNIMPLEMENTED`` message.
- This behavior probably didn't cause any outright errors, but it doesn't seem
- to conform to the RFCs and could cause (non-infinite) feedback loops in some
+ respond to ``MSG_UNIMPLEMENTED`` with its own ``MSG_UNIMPLEMENTED``. This
+ behavior probably didn't cause any outright errors, but it doesn't seem to
+ conform to the RFCs and could cause (non-infinite) feedback loops in some
scenarios (usually those involving Paramiko on both ends).
- :bug:`1283` Fix exploit (CVE pending) in Paramiko's server mode (**not**
client mode) where hostile clients could trick the server into thinking they