1 files changed, 30 insertions, 1 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index fee5a962..19383cdc 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -9,18 +9,31 @@ Changelog
   protect against `timing-based attacks
   <http://codahale.com/a-lesson-in-timing-attacks/>`_. Thanks to Alex Gaynor
   for the patch.
+* :release:`1.11.4 <2014-02-14>`
 * :release:`1.10.6 <2014-02-14>`
+* :bug:`252` (`Fabric #1020 <https://github.com/fabric/fabric/issues/1020>`_)
+  Enhanced the implementation of ``ProxyCommand`` to avoid a deadlock/hang
+  condition that frequently occurs at ``Transport`` shutdown time. Thanks to
+  Mateusz Kobos, Matthijs van der Vleuten and Guillaume Zitta for the original
+  reports and to Marius Gedminas for helping test nontrivial use cases.
+* :bug:`268` Fix some missed renames of ``ProxyCommand`` related error classes.
+  Thanks to Marius Gedminas for catch & patch.
 * :bug:`34` (PR :issue:`35`) Fix SFTP prefetching incompatibility with some
   SFTP servers regarding request/response ordering. Thanks to Richard
-  Kettlewell for catch & patch.
+  Kettlewell.
 * :bug:`193` (and its attentant PRs :issue:`230` & :issue:`253`) Fix SSH agent
   problems present on Windows. Thanks to David Hobbs for initial report and to
   Aarni Koskela & Olle Lundberg for the patches.
+* :release:`1.11.3 <2014-01-08>`
 * :release:`1.10.5 <2014-01-08>`
 * :bug:`176` Fix AttributeError bugs in known_hosts file (re)loading. Thanks
   to Nathan Scowcroft for the patch & Martin Blumenstingl for the initial test
   case.
+* :release:`1.11.2 <2013-09-27>`
 * :release:`1.10.4 <2013-09-27>`
+* :bug:`156 (1.11+)` Fix potential deadlock condition when using Channel
+  objects as sockets (e.g. when using SSH gatewaying). Thanks to Steven Noonan
+  and Frank Arnold for catch & patch.
 * :bug:`179` Fix a missing variable causing errors when an ssh_config file has
   a non-default AddressFamily set. Thanks to Ed Marshall & Tomaz Muraus for
   catch & patch.
@@ -28,6 +41,7 @@ Changelog
   Buchanan for catch & Dave Foster for patch.
 * :bug:`199` Typo fix in the license header cross-project. Thanks to Armin
   Ronacher for catch & patch.
+* :release:`1.11.1 <2013-09-20>`
 * :release:`1.10.3 <2013-09-20>`
 * :bug:`162` Clean up HMAC module import to avoid deadlocks in certain uses of
   SSHClient. Thanks to Gernot Hillier for the catch & suggested fix.
@@ -35,7 +49,22 @@ Changelog
   Thanks to Jonathan Halcrow for catch & patch.
 * :bug:`168` Update config handling to properly handle multiple 'localforward'
   and 'remoteforward' keys. Thanks to Emre Yılmaz for the patch.
+* :release:`1.11.0 <2013-07-26>`
 * :release:`1.10.2 <2013-07-26>`
+* :bug:`98 major` On Windows, when interacting with the PuTTY PAgeant, Paramiko
+  now creates the shared memory map with explicit Security Attributes of the
+  user, which is the same technique employed by the canonical PuTTY library to
+  avoid permissions issues when Paramiko is running under a different UAC
+  context than the PuTTY Ageant process. Thanks to Jason R. Coombs for the
+  patch.
+* :support:`100` Remove use of PyWin32 in ``win_pageant`` module. Module was
+  already dependent on ctypes for constructing appropriate structures and had
+  ctypes implementations of all functionality. Thanks to Jason R. Coombs for
+  the patch.
+* :bug:`87 major` Ensure updates to ``known_hosts`` files account for any
+  updates to said files after Paramiko initially read them. (Includes related
+  fix to guard against duplicate entries during subsequent ``known_hosts``
+  loads.) Thanks to ``@sunweaver`` for the contribution.
 * :bug:`153` (also :issue:`67`) Warn on parse failure when reading known_hosts
   file.  Thanks to ``@glasserc`` for patch.
 * :bug:`146` Indentation fixes for readability. Thanks to Abhinav Upadhyay for