Merge branch 'master' into switch-to-cryptography

5 files changed, 16 insertions, 7 deletions

diff --git a/paramiko/_version.py b/paramiko/_version.py
index a7857b09..d9f78740 100644
--- a/paramiko/_version.py
+++ b/paramiko/_version.py
@@ -1,2 +1,2 @@
-__version_info__ = (1, 15, 0)
+__version_info__ = (1, 15, 1)
 __version__ = '.'.join(map(str, __version_info__))
diff --git a/paramiko/client.py b/paramiko/client.py
index 05686d97..393e3e09 100644
--- a/paramiko/client.py
+++ b/paramiko/client.py
@@ -250,7 +250,7 @@ class SSHClient (ClosingContextManager):
                     pass
             retry_on_signal(lambda: sock.connect(addr))
 
-        t = self._transport = Transport(sock, gss_kex, gss_deleg_creds)
+        t = self._transport = Transport(sock, gss_kex=gss_kex, gss_deleg_creds=gss_deleg_creds)
         t.use_compression(compress=compress)
         if gss_kex and gss_host is None:
             t.set_gss_host(hostname)
diff --git a/paramiko/transport.py b/paramiko/transport.py
index 62eae90a..b2599ac4 100644
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -1002,10 +1002,14 @@ class Transport (threading.Thread, ClosingContextManager):
         :param .PKey pkey:
             a private key to use for authentication, if you want to use private
             key authentication; otherwise ``None``.
-        :param str gss_host: The targets name in the kerberos database. default: hostname
-        :param bool gss_auth: ``True`` if you want to use GSS-API authentication
-        :param bool gss_kex: Perform GSS-API Key Exchange and user authentication
-        :param bool gss_deleg_creds: Delegate GSS-API client credentials or not
+        :param str gss_host:
+            The target's name in the kerberos database. Default: hostname
+        :param bool gss_auth:
+            ``True`` if you want to use GSS-API authentication.
+        :param bool gss_kex:
+            Perform GSS-API Key Exchange and user authentication.
+        :param bool gss_deleg_creds:
+            Whether to delegate GSS-API client credentials.
 
         :raises SSHException: if the SSH2 negotiation fails, the host key
             supplied by the server is incorrect, or authentication fails.
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 49067855..374e04b3 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,11 @@
 Changelog
 =========
 
+* :release:`1.15.1 <2014-09-22>`
+* :bug:`399` SSH agent forwarding (potentially other functionality as
+  well) would hang due to incorrect values passed into the new window size
+  arguments for `.Transport` (thanks to a botched merge). This has been
+  corrected. Thanks to Dylan Thacker-Smith for the report & patch.
 * :feature:`167` Add `.SSHConfig.get_hostnames` for easier introspection of a
   loaded SSH config file or object. Courtesy of Søren Løvborg.
 * :release:`1.15.0 <2014-09-18>`
diff --git a/tests/test_kex_gss.py b/tests/test_kex_gss.py
index b5e277b3..8769d09c 100644
--- a/tests/test_kex_gss.py
+++ b/tests/test_kex_gss.py
@@ -84,7 +84,7 @@ class GSSKexTest(unittest.TestCase):
 
     def _run(self):
         self.socks, addr = self.sockl.accept()
-        self.ts = paramiko.Transport(self.socks, True)
+        self.ts = paramiko.Transport(self.socks, gss_kex=True)
         host_key = paramiko.RSAKey.from_private_key_file('tests/test_rsa.key')
         self.ts.add_server_key(host_key)
         self.ts.set_gss_host(targ_name)