From f9404c52c0a5899f9b998e2b52d2316b65202414 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Sat, 23 Apr 2016 16:17:16 -0700
Subject: Fix broken changelog doc link

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

(limited to 'sites/www/changelog.rst')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 18c7ce5e..135bb839 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -115,8 +115,9 @@ Changelog
   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.
+* :feature:`167` Add `~paramiko.config.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>`
 * :support:`393` Replace internal use of PyCrypto's ``SHA.new`` with the
   stdlib's ``hashlib.sha1``. Thanks to Alex Gaynor.
-- 
cgit v1.2.3


From 3f151d44b95a414918237be91ae0fba8b167faa2 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Sat, 23 Apr 2016 18:36:27 -0700
Subject: Changelog closes #632

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

(limited to 'sites/www/changelog.rst')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 135bb839..9989fa35 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
 Changelog
 =========
 
+* :bug:`632` Fix logic bug in the SFTP client's callback-calling functionality;
+  previously there was a chance the given callback would fire twice at the end
+  of a transfer. Thanks to ``@ab9-er`` for catch & patch.
 * :support:`612` Identify & work around a race condition in the test for
   handshake timeouts, which was causing frequent test failures for a subset of
   contributors as well as Travis-CI (usually, but not always, limited to Python
-- 
cgit v1.2.3


From c312b620e7945797468702aeb27cb58def3f0f80 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Sat, 23 Apr 2016 18:55:19 -0700
Subject: Meh

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

(limited to 'sites/www/changelog.rst')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 9989fa35..ce984035 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -4,7 +4,7 @@ Changelog
 
 * :bug:`632` Fix logic bug in the SFTP client's callback-calling functionality;
   previously there was a chance the given callback would fire twice at the end
-  of a transfer. Thanks to ``@ab9-er`` for catch & patch.
+  of a transfer. Thanks to ``@ab9-er`` for catch & original patch.
 * :support:`612` Identify & work around a race condition in the test for
   handshake timeouts, which was causing frequent test failures for a subset of
   contributors as well as Travis-CI (usually, but not always, limited to Python
-- 
cgit v1.2.3


From 2d4ad462d58370dcf498b56b567f3babca0052d6 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Sun, 24 Apr 2016 12:12:47 -0700
Subject: Expose some effectively-public Channel attributes in API docs.

Closes #621
---
 paramiko/channel.py     | 5 +++++
 sites/www/changelog.rst | 3 +++
 2 files changed, 8 insertions(+)

(limited to 'sites/www/changelog.rst')

diff --git a/paramiko/channel.py b/paramiko/channel.py
index 44a4b291..f4540bcd 100644
--- a/paramiko/channel.py
+++ b/paramiko/channel.py
@@ -88,15 +88,20 @@ class Channel (ClosingContextManager):
         :param int chanid:
             the ID of this channel, as passed by an existing `.Transport`.
         """
+        #: Channel ID
         self.chanid = chanid
+        #: Remote channel ID
         self.remote_chanid = 0
+        #: `.Transport` managing this channel
         self.transport = None
+        #: Whether the connection is presently active
         self.active = False
         self.eof_received = 0
         self.eof_sent = 0
         self.in_buffer = BufferedPipe()
         self.in_stderr_buffer = BufferedPipe()
         self.timeout = None
+        #: Whether the connection has been closed
         self.closed = False
         self.ultra_debug = False
         self.lock = threading.Lock()
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index ce984035..feef1c9b 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
 Changelog
 =========
 
+* :support:`621 backported` Annotate some public attributes on
+  `~paramiko.channel.Channel` such as ``.closed``. Thanks to Sergey Vasilyev
+  for the report.
 * :bug:`632` Fix logic bug in the SFTP client's callback-calling functionality;
   previously there was a chance the given callback would fire twice at the end
   of a transfer. Thanks to ``@ab9-er`` for catch & original patch.
-- 
cgit v1.2.3


From f15b383e4499e85689bfcc83dc942f0b6c898264 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Sun, 24 Apr 2016 13:16:51 -0700
Subject: Changelog re #619, re #613

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

(limited to 'sites/www/changelog.rst')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 6a605216..32b5752b 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
 Changelog
 =========
 
+* :bug:`613` (via :issue:`619`) Update to ``jaraco.windows`` 3.4.1 to fix some
+  errors related to ``ctypes`` on Windows platforms. Credit to Jason R. Coombs.
 * :support:`621 backported` Annotate some public attributes on
   `~paramiko.channel.Channel` such as ``.closed``. Thanks to Sergey Vasilyev
   for the report.
-- 
cgit v1.2.3


From e2206bc9a6ec2d4eae316a12fef50fc898d6db12 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Sun, 24 Apr 2016 14:09:33 -0700
Subject: Changelog re #617, #679, #678, #685.

Also re https://github.com/fabric/fabric/issues/1429 but IDK if Github will tickle that repo correctly :D
---
 sites/www/changelog.rst | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'sites/www/changelog.rst')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 32b5752b..d7c7fa8a 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,11 @@
 Changelog
 =========
 
+* :bug:`617` (aka `fabric/fabric#1429
+  <https://github.com/fabric/fabric/issues/1429>`_; via :issue:`679`; related:
+  :issue:`678`, :issue:`685`) Fix up
+  `~paramiko.ssh_exception.NoValidConnectionsError` so it pickles correctly.
+  Thanks to Rebecca Schlussel for the report & Marius Gedminas for the patch.
 * :bug:`613` (via :issue:`619`) Update to ``jaraco.windows`` 3.4.1 to fix some
   errors related to ``ctypes`` on Windows platforms. Credit to Jason R. Coombs.
 * :support:`621 backported` Annotate some public attributes on
-- 
cgit v1.2.3


From b7c9b5d7649903cd14ceb40f8e691aa27d413962 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Sun, 24 Apr 2016 14:12:57 -0700
Subject: Oh hey this also fixes the only other open 1.16.1 ticket yey

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

(limited to 'sites/www/changelog.rst')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index d7c7fa8a..20ea740f 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -4,7 +4,7 @@ Changelog
 
 * :bug:`617` (aka `fabric/fabric#1429
   <https://github.com/fabric/fabric/issues/1429>`_; via :issue:`679`; related:
-  :issue:`678`, :issue:`685`) Fix up
+  :issue:`678`, :issue:`685`, :issue:`616`) Fix up
   `~paramiko.ssh_exception.NoValidConnectionsError` so it pickles correctly.
   Thanks to Rebecca Schlussel for the report & Marius Gedminas for the patch.
 * :bug:`613` (via :issue:`619`) Update to ``jaraco.windows`` 3.4.1 to fix some
-- 
cgit v1.2.3


From a3a8d3f1f1f6c7431e2c79fb798cf884021e375a Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Sun, 24 Apr 2016 14:14:33 -0700
Subject: Apparently a whole lot of people noticed that tiny python 3 issue

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

(limited to 'sites/www/changelog.rst')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 20ea740f..795e03eb 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -4,7 +4,7 @@ Changelog
 
 * :bug:`617` (aka `fabric/fabric#1429
   <https://github.com/fabric/fabric/issues/1429>`_; via :issue:`679`; related:
-  :issue:`678`, :issue:`685`, :issue:`616`) Fix up
+  :issue:`678`, :issue:`685`, :issue:`615` & :issue:`616`) Fix up
   `~paramiko.ssh_exception.NoValidConnectionsError` so it pickles correctly.
   Thanks to Rebecca Schlussel for the report & Marius Gedminas for the patch.
 * :bug:`613` (via :issue:`619`) Update to ``jaraco.windows`` 3.4.1 to fix some
-- 
cgit v1.2.3


From 8311ad95adbfefa681f1c827c047a740f46f11fc Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Sun, 24 Apr 2016 14:16:41 -0700
Subject: Be clearer

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

(limited to 'sites/www/changelog.rst')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 795e03eb..e7c420da 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -5,8 +5,9 @@ Changelog
 * :bug:`617` (aka `fabric/fabric#1429
   <https://github.com/fabric/fabric/issues/1429>`_; via :issue:`679`; related:
   :issue:`678`, :issue:`685`, :issue:`615` & :issue:`616`) Fix up
-  `~paramiko.ssh_exception.NoValidConnectionsError` so it pickles correctly.
-  Thanks to Rebecca Schlussel for the report & Marius Gedminas for the patch.
+  `~paramiko.ssh_exception.NoValidConnectionsError` so it pickles correctly,
+  and fix a related Python 3 compatibility issue. Thanks to Rebecca Schlussel
+  for the report & Marius Gedminas for the patch.
 * :bug:`613` (via :issue:`619`) Update to ``jaraco.windows`` 3.4.1 to fix some
   errors related to ``ctypes`` on Windows platforms. Credit to Jason R. Coombs.
 * :support:`621 backported` Annotate some public attributes on
-- 
cgit v1.2.3