Merge branch '1.10' into 1.11

Conflicts:
	NEWS
	sites/www/changelog.rst

1 files changed, 4 insertions, 148 deletions

diff --git a/NEWS b/NEWS
index e5d4d1fa..761f8e48 100644
--- a/NEWS
+++ b/NEWS
@@ -9,157 +9,13 @@ Issues noted as "'ssh' #NN" can be found at https://github.com/bitprophet/ssh/.
 
 Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/.
 
-Releases
-========
-
-v1.11.4 (21st Jan 2014)
------------------------
-
-* #193 (and its attentant PRs #230 & #253): Fix SSH agent problems present on
-  Windows. Thanks to David Hobbs for initial report and to Aarni Koskela & Olle
-  Lundberg for the patches.
-
-v1.10.6 (21st Jan 2014)
------------------------
-
-* #193 (and its attentant PRs #230 & #253): Fix SSH agent problems present on
-  Windows. Thanks to David Hobbs for initial report and to Aarni Koskela & Olle
-  Lundberg for the patches.
-
-v1.11.3 (8th Jan 2014)
-----------------------
-
-* #176: Fix AttributeError bugs in known_hosts file (re)loading. Thanks to
-  Nathan Scowcroft for the patch & Martin Blumenstingl for the initial test
-  case.
 
-v1.10.5 (8th Jan 2014)
-----------------------
+**PLEASE NOTE:** For changes in 1.10.x and newer releases, please see
+www.paramiko.org's changelog page, or the source file, sites/www/changelog.rst
 
-* #176: Fix AttributeError bugs in known_hosts file (re)loading. Thanks to
-  Nathan Scowcroft for the patch & Martin Blumenstingl for the initial test
-  case.
-
-v1.11.2 (27th Sep 2013)
------------------------
 
-* #156: 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.
-* #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.
-* #200: Fix an exception-causing typo in `demo_simple.py`. Thanks to Alex
-  Buchanan for catch & Dave Foster for patch.
-* #199: Typo fix in the license header cross-project. Thanks to Armin Ronacher
-  for catch & patch.
-
-v1.10.4 (27th Sep 2013)
------------------------
-
-* #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.
-* #200: Fix an exception-causing typo in `demo_simple.py`. Thanks to Alex
-  Buchanan for catch & Dave Foster for patch.
-* #199: Typo fix in the license header cross-project. Thanks to Armin Ronacher
-  for catch & patch.
-
-v1.11.1 (20th Sep 2013)
------------------------
-
-* #162: Clean up HMAC module import to avoid deadlocks in certain uses of
-  SSHClient. Thanks to Gernot Hillier for the catch & suggested
-  fix.
-* #36: Fix the port-forwarding demo to avoid file descriptor errors. Thanks to
-  Jonathan Halcrow for catch & patch.
-* #168: Update config handling to properly handle multiple 'localforward' and
-  'remoteforward' keys. Thanks to Emre Yılmaz for the patch.
-
-v1.10.3 (20th Sep 2013)
------------------------
-
-* #162: Clean up HMAC module import to avoid deadlocks in certain uses of
-  SSHClient. Thanks to Gernot Hillier for the catch & suggested
-  fix.
-* #36: Fix the port-forwarding demo to avoid file descriptor errors. Thanks to
-  Jonathan Halcrow for catch & patch.
-* #168: Update config handling to properly handle multiple 'localforward' and
-  'remoteforward' keys. Thanks to Emre Yılmaz for the patch.
-
-v1.11.0 (26th Jul 2013)
------------------------
-
-* #98: 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.
-* #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.
-* #87: 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.
-
-v1.10.2 (26th Jul 2013)
------------------------
-
-* #153, #67: Warn on parse failure when reading known_hosts file. Thanks to
-  `@glasserc` for patch.
-* #146: Indentation fixes for readability. Thanks to Abhinav Upadhyay for catch
-  & patch.
-
-v1.10.1 (5th Apr 2013)
-----------------------
-
-* #142: (Fabric #811) SFTP put of empty file will still return the attributes
-  of the put file. Thanks to Jason R. Coombs for the patch.
-* #154: (Fabric #876) Forwarded SSH agent connections left stale local pipes
-  lying around, which could cause local (and sometimes remote or network)
-  resource starvation when running many agent-using remote commands. Thanks to
-  Kevin Tegtmeier for catch & patch.
-
-v1.10.0 (1st Mar 2013)
---------------------
-
-* #66: Batch SFTP writes to help speed up file transfers. Thanks to Olle
-  Lundberg for the patch.
-* #133: Fix handling of window-change events to be on-spec and not
-  attempt to wait for a response from the remote sshd; this fixes problems with
-  less common targets such as some Cisco devices. Thanks to Phillip Heller for
-  catch & patch.
-* #93: Overhaul SSH config parsing to be in line with `man ssh_config` (& the
-  behavior of `ssh` itself), including addition of parameter expansion within
-  config values. Thanks to Olle Lundberg for the patch.
-* #110: Honor SSH config `AddressFamily` setting when looking up local
-  host's FQDN. Thanks to John Hensley for the patch.
-* #128: Defer FQDN resolution until needed, when parsing SSH config files.
-  Thanks to Parantapa Bhattacharya for catch & patch.
-* #102: Forego random padding for packets when running under `*-ctr` ciphers.
-  This corrects some slowdowns on platforms where random byte generation is
-  inefficient (e.g. Windows). Thanks to  `@warthog618` for catch & patch, and
-  Michael van der Kolff for code/technique review.
-* #127: Turn `SFTPFile` into a context manager. Thanks to Michael Williamson
-  for the patch.
-* #116: Limit `Message.get_bytes` to an upper bound of 1MB to protect against
-  potential DoS vectors. Thanks to `@mvschaik` for catch & patch.
-* #115: Add convenience `get_pty` kwarg to `Client.exec_command` so users not
-  manually controlling a channel object can still toggle PTY creation. Thanks
-  to Michael van der Kolff for the patch.
-* #71: Add `SFTPClient.putfo` and `.getfo` methods to allow direct
-  uploading/downloading of file-like objects. Thanks to Eric Buehl for the
-  patch.
-* #113: Add `timeout` parameter to `SSHClient.exec_command` for easier setting
-  of the command's internal channel object's timeout. Thanks to Cernov Vladimir
-  for the patch.
-* #94: Remove duplication of SSH port constant. Thanks to Olle Lundberg for the
-  catch.
-* #80: Expose the internal "is closed" property of the file transfer class
-  `BufferedFile` as `.closed`, better conforming to Python's file interface.
-  Thanks to `@smunaut` and James Hiscock for catch & patch.
+Releases
+========
 
 v1.9.0 (6th Nov 2012)
 ---------------------