From 2a88241ea7ed3facf730678ef28a8281903cf9a9 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 25 Aug 2014 16:27:15 -0700
Subject: Add a plus to our 3.3 support to denote 3.4 and on

---
 sites/www/installing.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sites/www')

diff --git a/sites/www/installing.rst b/sites/www/installing.rst
index 729147c5..052825c4 100644
--- a/sites/www/installing.rst
+++ b/sites/www/installing.rst
@@ -16,7 +16,7 @@ via `pip <http://pip-installer.org>`_::
     Users who want the bleeding edge can install the development version via
     ``pip install paramiko==dev``.
 
-We currently support **Python 2.6, 2.7 and 3.3** (Python **3.2** should also
+We currently support **Python 2.6, 2.7 and 3.3+** (Python **3.2** should also
 work but has a less-strong compatibility guarantee from us.) Users on Python
 2.5 or older are urged to upgrade.
 
-- 
cgit v1.2.3


From 5d010cd8c496e1ed7e13e7110f7fca9632c08e47 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 25 Aug 2014 16:28:02 -0700
Subject: Changelog re #371

---
 sites/www/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index f8a4d2c1..5ed0c961 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
 Changelog
 =========
 
+* :support:`371` Add Travis support & docs update for Python 3.4. Thanks to
+  Olle Lundberg.
 * :release:`1.14.0 <2014-05-07>`
 * :release:`1.13.1 <2014-05-07>`
 * :release:`1.12.4 <2014-05-07>`
-- 
cgit v1.2.3


From fd1e162243898e34545ef5c1985bedee16174981 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 25 Aug 2014 21:59:59 -0700
Subject: Changelog re #285, re #352

---
 sites/www/changelog.rst | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 5ed0c961..2e2d2f63 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,12 @@
 Changelog
 =========
 
+* :bug:`285` (also :issue:`352`) Update our Python 3 ``b()`` compatibility shim
+  to handle ``buffer`` objects correctly; this fixes a frequently reported
+  issue affecting many users, including users of the ``bzr`` software suite.
+  Thanks to ``@basictheprogram`` for the initial report, Jelmer Vernooij for
+  the fix and Andrew Starr-Bochicchio & Jeremy T. Bouse (among others) for
+  discussion & feedback.
 * :support:`371` Add Travis support & docs update for Python 3.4. Thanks to
   Olle Lundberg.
 * :release:`1.14.0 <2014-05-07>`
-- 
cgit v1.2.3


From d05ca17db876055a5f584e720b1b0733116b4365 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 25 Aug 2014 21:59:59 -0700
Subject: Changelog re #285, re #352

Conflicts:
	sites/www/changelog.rst
---
 sites/www/changelog.rst | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index a652e565..5c8e02f4 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,12 @@
 Changelog
 =========
 
+* :bug:`285` (also :issue:`352`) Update our Python 3 ``b()`` compatibility shim
+  to handle ``buffer`` objects correctly; this fixes a frequently reported
+  issue affecting many users, including users of the ``bzr`` software suite.
+  Thanks to ``@basictheprogram`` for the initial report, Jelmer Vernooij for
+  the fix and Andrew Starr-Bochicchio & Jeremy T. Bouse (among others) for
+  discussion & feedback.
 * :release:`1.13.1 <2014-05-07>`
 * :release:`1.12.4 <2014-05-07>`
 * :release:`1.11.6 <2014-05-07>`
-- 
cgit v1.2.3


From 87f6f56196b0b384c906db96ef5593c5cb6a0c61 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 25 Aug 2014 22:26:33 -0700
Subject: Changelog re #169

---
 sites/www/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 5c8e02f4..b9d0df0b 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
 Changelog
 =========
 
+* :support:`169 backported` Minor refactor of
+  `paramiko.sftp_client.SFTPClient.put` thanks to Abhinav Upadhyay.
 * :bug:`285` (also :issue:`352`) Update our Python 3 ``b()`` compatibility shim
   to handle ``buffer`` objects correctly; this fixes a frequently reported
   issue affecting many users, including users of the ``bzr`` software suite.
-- 
cgit v1.2.3


From 5fc6969e23ec5e013f432e4efbe12d771150c1e1 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 25 Aug 2014 22:32:21 -0700
Subject: Fix docstrings re: addition of `getfo`/`putfo`, closes #229

---
 paramiko/sftp_client.py | 8 ++------
 sites/www/changelog.rst | 2 ++
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'sites/www')

diff --git a/paramiko/sftp_client.py b/paramiko/sftp_client.py
index cbef8f71..2ff2d51d 100644
--- a/paramiko/sftp_client.py
+++ b/paramiko/sftp_client.py
@@ -534,9 +534,7 @@ class SFTPClient(BaseSFTP):
             an `.SFTPAttributes` object containing attributes about the given
             file.
 
-        .. versionadded:: 1.4
-        .. versionchanged:: 1.7.4
-            Began returning rich attribute objects.
+        .. versionadded:: 1.10
         """
         with self.file(remotepath, 'wb') as fr:
             fr.set_pipelined(True)
@@ -601,9 +599,7 @@ class SFTPClient(BaseSFTP):
             the bytes transferred so far and the total bytes to be transferred
         :return: the `number <int>` of bytes written to the opened file object
 
-        .. versionadded:: 1.4
-        .. versionchanged:: 1.7.4
-            Added the ``callable`` param.
+        .. versionadded:: 1.10
         """
         with self.open(remotepath, 'rb') as fr:
             file_size = self.stat(remotepath).st_size
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index b9d0df0b..cdd513f4 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
 Changelog
 =========
 
+* :support:`229` Fix a couple of incorrectly-copied docstrings' ``..
+  versionadded::`` RST directives. Thanks to Aarni Koskela for the catch.
 * :support:`169 backported` Minor refactor of
   `paramiko.sftp_client.SFTPClient.put` thanks to Abhinav Upadhyay.
 * :bug:`285` (also :issue:`352`) Update our Python 3 ``b()`` compatibility shim
-- 
cgit v1.2.3


From 12e752d11aa22ee6ba959115725e386ca779c1cb Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 25 Aug 2014 22:44:54 -0700
Subject: Rework re #239 to work off post-1.13 codebase. Closes #239

---
 paramiko/config.py      | 2 +-
 sites/www/changelog.rst | 2 ++
 tests/test_util.py      | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'sites/www')

diff --git a/paramiko/config.py b/paramiko/config.py
index 77fa13d7..f650ee24 100644
--- a/paramiko/config.py
+++ b/paramiko/config.py
@@ -55,7 +55,7 @@ class SSHConfig (object):
         """
         host = {"host": ['*'], "config": {}}
         for line in file_obj:
-            line = line.rstrip('\n').lstrip()
+            line = line.rstrip('\r\n').lstrip()
             if (line == '') or (line[0] == '#'):
                 continue
             if '=' in line:
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index cdd513f4..903e6378 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
 Changelog
 =========
 
+* :bug:`239` Add Windows-style CRLF support to SSH config file parsing. Props
+  to Christopher Swenson.
 * :support:`229` Fix a couple of incorrectly-copied docstrings' ``..
   versionadded::`` RST directives. Thanks to Aarni Koskela for the catch.
 * :support:`169 backported` Minor refactor of
diff --git a/tests/test_util.py b/tests/test_util.py
index 6bde4045..ecf8db72 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -338,3 +338,9 @@ IdentityFile something_%l_using_fqdn
 """
         config = paramiko.util.parse_ssh_config(StringIO(test_config))
         assert config.lookup('meh')  # will die during lookup() if bug regresses
+
+    def test_13_config_dos_crlf_succeeds(self):
+        config_file = StringIO("host abcqwerty\r\nHostName 127.0.0.1\r\n")
+        config = paramiko.SSHConfig()
+        config.parse(config_file)
+        self.assertEqual(config.lookup("abcqwerty")["hostname"], "127.0.0.1")
-- 
cgit v1.2.3


From 118d581f92b1aa49a482c68faa73df0c8967b3c4 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 25 Aug 2014 22:58:58 -0700
Subject: Changelog re #272

---
 sites/www/changelog.rst | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 903e6378..99115727 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,10 @@
 Changelog
 =========
 
+* :bug:`272` Fix a bug where ``known_hosts`` parsing hashed the input hostname
+  as well as the hostnames from the ``known_hosts`` file, on every comparison.
+  Thanks to ``@sigmunau`` for final patch and ``@ostacey`` for the original
+  report.
 * :bug:`239` Add Windows-style CRLF support to SSH config file parsing. Props
   to Christopher Swenson.
 * :support:`229` Fix a couple of incorrectly-copied docstrings' ``..
-- 
cgit v1.2.3


From c7ffe1718a3bae232b7ecef959545dac9f729095 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 25 Aug 2014 23:07:57 -0700
Subject: Changelog re #312, closes #312

---
 sites/www/changelog.rst | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 99115727..b315b0d7 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,10 @@
 Changelog
 =========
 
+* :bug:`312` `paramiko.transport.Transport` had a bug in its ``__repr__`` which
+  surfaces during errors encountered within its ``__init__``, causing
+  problematic tracebacks in such situations. Thanks to Simon Percivall for
+  catch & patch.
 * :bug:`272` Fix a bug where ``known_hosts`` parsing hashed the input hostname
   as well as the hostnames from the ``known_hosts`` file, on every comparison.
   Thanks to ``@sigmunau`` for final patch and ``@ostacey`` for the original
-- 
cgit v1.2.3


From 77919c6c25d9016c74537ea9b901cedc19050983 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 25 Aug 2014 23:15:22 -0700
Subject: Changelog re #324, closes #324

---
 sites/www/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index b315b0d7..6979b97e 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
 Changelog
 =========
 
+* :support:`324 backported` A bevvy of documentation typo fixes, courtesy of Roy
+  Wellington.
 * :bug:`312` `paramiko.transport.Transport` had a bug in its ``__repr__`` which
   surfaces during errors encountered within its ``__init__``, causing
   problematic tracebacks in such situations. Thanks to Simon Percivall for
-- 
cgit v1.2.3


From 3908baad6e1d6d4fc62da24111cd466ce5cb9a88 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 25 Aug 2014 23:34:13 -0700
Subject: Changelog re #376, closes #376

---
 sites/www/changelog.rst | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 6979b97e..9258cfec 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
 Changelog
 =========
 
+* :bug:`376` Be less aggressive about expanding variables in ``ssh_config``
+  files, which results in a speedup of SSH config parsing. Credit to Olle
+  Lundberg.
 * :support:`324 backported` A bevvy of documentation typo fixes, courtesy of Roy
   Wellington.
 * :bug:`312` `paramiko.transport.Transport` had a bug in its ``__repr__`` which
-- 
cgit v1.2.3


From 1b69e0f4095883ef3f282552fde12dfb00ebdda4 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 25 Aug 2014 23:42:21 -0700
Subject: Cut 1.13.2

---
 paramiko/__init__.py    | 2 +-
 setup.py                | 2 +-
 sites/www/changelog.rst | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'sites/www')

diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index 22f1bc21..d86b868b 100644
--- a/paramiko/__init__.py
+++ b/paramiko/__init__.py
@@ -23,7 +23,7 @@ if sys.version_info < (2, 6):
 
 
 __author__ = "Jeff Forcier <jeff@bitprophet.org>"
-__version__ = "1.13.1"
+__version__ = "1.13.2"
 __version_info__ = tuple([ int(d) for d in __version__.split(".") ])
 __license__ = "GNU Lesser General Public License (LGPL)"
 
diff --git a/setup.py b/setup.py
index 05dc98d5..082a843e 100644
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,7 @@ if sys.platform == 'darwin':
 
 setup(
     name = "paramiko",
-    version = "1.13.1",
+    version = "1.13.2",
     description = "SSH2 protocol library",
     long_description = longdesc,
     author = "Jeff Forcier",
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 9258cfec..9c519c03 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
 Changelog
 =========
 
+* :release:`1.13.2 <2014-08-25>`
 * :bug:`376` Be less aggressive about expanding variables in ``ssh_config``
   files, which results in a speedup of SSH config parsing. Credit to Olle
   Lundberg.
-- 
cgit v1.2.3


From d7b93df7aaf9f409da7578a107829c138d042121 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 25 Aug 2014 23:43:48 -0700
Subject: Cut 1.14.1

---
 paramiko/__init__.py    | 2 +-
 setup.py                | 2 +-
 sites/www/changelog.rst | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'sites/www')

diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index 4c62ad4a..2ebc8a65 100644
--- a/paramiko/__init__.py
+++ b/paramiko/__init__.py
@@ -23,7 +23,7 @@ if sys.version_info < (2, 6):
 
 
 __author__ = "Jeff Forcier <jeff@bitprophet.org>"
-__version__ = "1.14.0"
+__version__ = "1.14.1"
 __version_info__ = tuple([ int(d) for d in __version__.split(".") ])
 __license__ = "GNU Lesser General Public License (LGPL)"
 
diff --git a/setup.py b/setup.py
index c0f1e579..38e444f5 100644
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,7 @@ if sys.platform == 'darwin':
 
 setup(
     name = "paramiko",
-    version = "1.14.0",
+    version = "1.14.1",
     description = "SSH2 protocol library",
     long_description = longdesc,
     author = "Jeff Forcier",
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index c4c1e698..0fcde10f 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
 Changelog
 =========
 
+* :release:`1.14.1 <2014-08-25>`
 * :release:`1.13.2 <2014-08-25>`
 * :bug:`376` Be less aggressive about expanding variables in ``ssh_config``
   files, which results in a speedup of SSH config parsing. Credit to Olle
-- 
cgit v1.2.3


From 28b7db145fed32840f8d2edea8fdce27dc00ca26 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 25 Aug 2014 23:48:28 -0700
Subject: Consolidate version info. Closes #249

---
 paramiko/__init__.py    | 3 +--
 paramiko/_version.py    | 2 ++
 setup.py                | 9 ++++++++-
 sites/www/changelog.rst | 2 ++
 4 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 paramiko/_version.py

(limited to 'sites/www')

diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index 2ebc8a65..65f6f8a2 100644
--- a/paramiko/__init__.py
+++ b/paramiko/__init__.py
@@ -17,14 +17,13 @@
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
 
 import sys
+from paramiko._version import __version__, __version_info__
 
 if sys.version_info < (2, 6):
     raise RuntimeError('You need Python 2.6+ for this module.')
 
 
 __author__ = "Jeff Forcier <jeff@bitprophet.org>"
-__version__ = "1.14.1"
-__version_info__ = tuple([ int(d) for d in __version__.split(".") ])
 __license__ = "GNU Lesser General Public License (LGPL)"
 
 
diff --git a/paramiko/_version.py b/paramiko/_version.py
new file mode 100644
index 00000000..a7857b09
--- /dev/null
+++ b/paramiko/_version.py
@@ -0,0 +1,2 @@
+__version_info__ = (1, 15, 0)
+__version__ = '.'.join(map(str, __version_info__))
diff --git a/setup.py b/setup.py
index 3d8268d1..13386c8e 100644
--- a/setup.py
+++ b/setup.py
@@ -54,9 +54,16 @@ if sys.platform == 'darwin':
     setup_helper.install_custom_make_tarball()
 
 
+# Version info -- read without importing
+_locals = {}
+with open('paramiko/_version.py') as fp:
+    exec(fp.read(), None, _locals)
+version = _locals['__version__']
+
+
 setup(
     name = "paramiko",
-    version = "1.14.1",
+    version = version,
     description = "SSH2 protocol library",
     long_description = longdesc,
     author = "Jeff Forcier",
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 089ec30e..b6fa7ccc 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
 Changelog
 =========
 
+* :support:`249` Consolidate version information into one spot. Thanks to Gabi
+  Davar for the reminder.
 * :release:`1.14.1 <2014-08-25>`
 * :release:`1.13.2 <2014-08-25>`
 * :bug:`376` Be less aggressive about expanding variables in ``ssh_config``
-- 
cgit v1.2.3


From 9014c735fc94d133c5d9aada93d43f1f5d1145f2 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Tue, 26 Aug 2014 00:14:02 -0700
Subject: Forgot to mark one support-bug as backported

---
 sites/www/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 9c519c03..1ca3dfef 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -18,7 +18,7 @@ Changelog
   report.
 * :bug:`239` Add Windows-style CRLF support to SSH config file parsing. Props
   to Christopher Swenson.
-* :support:`229` Fix a couple of incorrectly-copied docstrings' ``..
+* :support:`229 backported` Fix a couple of incorrectly-copied docstrings' ``..
   versionadded::`` RST directives. Thanks to Aarni Koskela for the catch.
 * :support:`169 backported` Minor refactor of
   `paramiko.sftp_client.SFTPClient.put` thanks to Abhinav Upadhyay.
-- 
cgit v1.2.3


From b641c69a80e2bd4737c636e7edd0918d6753c3d0 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Tue, 26 Aug 2014 12:50:10 -0700
Subject: Backport #378 to 1.13, closes #378

---
 paramiko/config.py      | 12 +++++++-----
 sites/www/changelog.rst |  2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'sites/www')

diff --git a/paramiko/config.py b/paramiko/config.py
index 96ec9ef7..30e000e7 100644
--- a/paramiko/config.py
+++ b/paramiko/config.py
@@ -56,7 +56,7 @@ class SSHConfig (object):
         host = {"host": ['*'], "config": {}}
         for line in file_obj:
             line = line.rstrip('\r\n').lstrip()
-            if (line == '') or (line[0] == '#'):
+            if not line or line.startswith('#'):
                 continue
             if '=' in line:
                 # Ensure ProxyCommand gets properly split
@@ -90,7 +90,7 @@ class SSHConfig (object):
                 else:
                     host['config'][key] = [value]
             elif key not in host['config']:
-                host['config'].update({key: value})
+                host['config'][key] = value
         self._config.append(host)
 
     def lookup(self, hostname):
@@ -111,8 +111,10 @@ class SSHConfig (object):
 
         :param str hostname: the hostname to lookup
         """
-        matches = [config for config in self._config if
-                   self._allowed(hostname, config['host'])]
+        matches = [
+            config for config in self._config
+            if self._allowed(config['host'], hostname)
+        ]
 
         ret = {}
         for match in matches:
@@ -128,7 +130,7 @@ class SSHConfig (object):
         ret = self._expand_variables(ret, hostname)
         return ret
 
-    def _allowed(self, hostname, hosts):
+    def _allowed(self, hosts, hostname):
         match = False
         for host in hosts:
             if host.startswith('!') and fnmatch.fnmatch(hostname, host[1:]):
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 1ca3dfef..0cbc933f 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
 Changelog
 =========
 
+* :support:`378 backported` Minor code cleanup in the SSH config module
+  courtesy of Olle Lundberg.
 * :release:`1.13.2 <2014-08-25>`
 * :bug:`376` Be less aggressive about expanding variables in ``ssh_config``
   files, which results in a speedup of SSH config parsing. Credit to Olle
-- 
cgit v1.2.3


From 35b9d1540bd98af39e133960c61b06aba621f30d Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Fri, 5 Sep 2014 11:44:22 -0700
Subject: Changelog re #131

---
 sites/www/changelog.rst | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 24679d5f..e18b5368 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
 Changelog
 =========
 
+* :feature:`131` Add a `~paramiko.sftp_client.SFTPClient.listdir_iter` method
+  to `~paramiko.sftp_client.SFTPClient` allowing for more efficient,
+  async/generator based file listings. Thanks to John Begeman.
 * :support:`378 backported` Minor code cleanup in the SSH config module
   courtesy of Olle Lundberg.
 * :support:`249` Consolidate version information into one spot. Thanks to Gabi
-- 
cgit v1.2.3


From b8022866fac62d1757aa730d5991030f223088fd Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Fri, 5 Sep 2014 13:27:22 -0700
Subject: Changelog re #184

---
 sites/www/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index e18b5368..57f00f12 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
 Changelog
 =========
 
+* :feature:`184` Support quoted values in SSH config file parsing. Credit to
+  Yan Kalchevskiy.
 * :feature:`131` Add a `~paramiko.sftp_client.SFTPClient.listdir_iter` method
   to `~paramiko.sftp_client.SFTPClient` allowing for more efficient,
   async/generator based file listings. Thanks to John Begeman.
-- 
cgit v1.2.3


From 286b5fb7088b11efcbe6c1b452a1d1785890ac3f Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Fri, 5 Sep 2014 14:26:27 -0700
Subject: Changelog re #335

---
 sites/www/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 57f00f12..f1215f62 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
 Changelog
 =========
 
+* :bug:`335 major` Fix ECDSA key generation (generation of brand new ECDSA keys
+  was broken previously). Thanks to ``@solarw`` for catch & patch.
 * :feature:`184` Support quoted values in SSH config file parsing. Credit to
   Yan Kalchevskiy.
 * :feature:`131` Add a `~paramiko.sftp_client.SFTPClient.listdir_iter` method
-- 
cgit v1.2.3


From 89a8ef55a662883239102c802cd637c56fcaebd5 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Fri, 5 Sep 2014 19:49:32 -0700
Subject: Changelog re #218

---
 sites/www/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index f1215f62..f04e338b 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
 Changelog
 =========
 
+* :feature:`218` Add support for ECDSA private keys on the client side. Thanks
+  to ``@aszlig`` for the patch.
 * :bug:`335 major` Fix ECDSA key generation (generation of brand new ECDSA keys
   was broken previously). Thanks to ``@solarw`` for catch & patch.
 * :feature:`184` Support quoted values in SSH config file parsing. Credit to
-- 
cgit v1.2.3


From ec9f8a26d4ea77ce6e4a1afe1a9e3b29dbf002bf Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Sat, 6 Sep 2014 16:09:16 -0700
Subject: Changelog re #234

---
 sites/www/changelog.rst | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index f04e338b..44bd61e9 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
 Changelog
 =========
 
+* :bug:`234 major` Lower logging levels for a few overly-noisy log messages
+  about secure channels. Thanks to David Pursehouse for noticing & contributing
+  the fix.
 * :feature:`218` Add support for ECDSA private keys on the client side. Thanks
   to ``@aszlig`` for the patch.
 * :bug:`335 major` Fix ECDSA key generation (generation of brand new ECDSA keys
-- 
cgit v1.2.3


From b36b87ceefd50fa691eb5b46865d0c28a8c511dd Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 8 Sep 2014 10:48:33 -0700
Subject: Changelog re #298

---
 sites/www/changelog.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 44bd61e9..2f23d0fc 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,15 @@
 Changelog
 =========
 
+* :bug:`298 major` Don't perform point validation on ECDSA keys in
+  ``known_hosts`` files, since a) this can cause significant slowdown when such
+  keys exist, and b) ``known_hosts`` files are implicitly trustworthy. Thanks
+  to Kieran Spear for catch & patch.
+
+  .. note::
+    This change bumps up the version requirement for the ``ecdsa`` library to
+    ``0.11``.
+
 * :bug:`234 major` Lower logging levels for a few overly-noisy log messages
   about secure channels. Thanks to David Pursehouse for noticing & contributing
   the fix.
-- 
cgit v1.2.3


From 76aba9dbda5d5cad6b3c092e943c538079fcc7f0 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 8 Sep 2014 11:01:47 -0700
Subject: Changelog re #377

---
 sites/www/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 2f23d0fc..afe3b78d 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
 Changelog
 =========
 
+* :support:`377` Factor `~paramiko.channel.Channel` openness sanity check into
+  a decorator. Thanks to Olle Lundberg for original patch.
 * :bug:`298 major` Don't perform point validation on ECDSA keys in
   ``known_hosts`` files, since a) this can cause significant slowdown when such
   keys exist, and b) ``known_hosts`` files are implicitly trustworthy. Thanks
-- 
cgit v1.2.3


From a0f854d17fc59f0279d4d2b07d3fd810dfb1894e Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 8 Sep 2014 11:10:30 -0700
Subject: Changelog re #374, #375

---
 sites/www/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index afe3b78d..41e8310d 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
 Changelog
 =========
 
+* :support:`374` (also :issue:`375`) Old code cleanup courtesy of Olle
+  Lundberg.
 * :support:`377` Factor `~paramiko.channel.Channel` openness sanity check into
   a decorator. Thanks to Olle Lundberg for original patch.
 * :bug:`298 major` Don't perform point validation on ECDSA keys in
-- 
cgit v1.2.3


From 24e022bdf656f272b4dafb76df1a7739965be2f9 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 8 Sep 2014 12:50:03 -0700
Subject: Changelog re #373

---
 sites/www/changelog.rst | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 41e8310d..87f54e4e 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,10 @@
 Changelog
 =========
 
+* :bug:`373 major` Attempt to fix a handful of issues (such as :issue:`354`)
+  related to infinite loops and threading deadlocks. Thanks to Olle Lundberg as
+  well as a handful of community members who provided advice & feedback via
+  IRC.
 * :support:`374` (also :issue:`375`) Old code cleanup courtesy of Olle
   Lundberg.
 * :support:`377` Factor `~paramiko.channel.Channel` openness sanity check into
-- 
cgit v1.2.3


From 88d932f2bbab907879639122969fb1f763258d29 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 8 Sep 2014 14:58:45 -0700
Subject: Changelog re #372

---
 sites/www/changelog.rst | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 87f54e4e..9dfb254f 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,10 @@
 Changelog
 =========
 
+* :feature:`372` Update default window & packet sizes to more closely adhere to
+  the pertinent RFC; also expose these settings in the public API so they may
+  be overridden by client code. This should address some general speed issues
+  such as :issue:`175`. Big thanks to Olle Lundberg for the update.
 * :bug:`373 major` Attempt to fix a handful of issues (such as :issue:`354`)
   related to infinite loops and threading deadlocks. Thanks to Olle Lundberg as
   well as a handful of community members who provided advice & feedback via
-- 
cgit v1.2.3


From 9c9dcaf4885653f4dcd100b2724199976a20c21e Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 8 Sep 2014 15:04:41 -0700
Subject: Changelog re #362

---
 sites/www/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 9dfb254f..879483a4 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
 Changelog
 =========
 
+* :feature:`362` Allow users to control the SSH banner timeout. Thanks to Cory
+  Benfield.
 * :feature:`372` Update default window & packet sizes to more closely adhere to
   the pertinent RFC; also expose these settings in the public API so they may
   be overridden by client code. This should address some general speed issues
-- 
cgit v1.2.3


From de391e88e0a7e75cd977f162a883aa5ffdbdc591 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 8 Sep 2014 15:41:46 -0700
Subject: Changelog re #346

---
 sites/www/changelog.rst | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 879483a4..e111aab4 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
 Changelog
 =========
 
+* :bug:`346 major` Fix an issue in private key files' encryption salts that
+  could cause tracebacks and file corruption if keys were re-encrypted. Credit
+  to Xavier Nunn.
 * :feature:`362` Allow users to control the SSH banner timeout. Thanks to Cory
   Benfield.
 * :feature:`372` Update default window & packet sizes to more closely adhere to
-- 
cgit v1.2.3