Merge branch '1.10'

Conflicts:
	NEWS

NEWS

@@ -25,8 +25,8 @@
   implementations of all functionality. Thanks to Jason R. Coombs for the
   patch.
 
-v1.10.1 (DD MM YYYY)
---------------------
+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.
@@ -30,6 +30,10 @@
 
 * #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)
 --------------------

paramiko/__init__.py

@@ -55,7 +55,7 @@
 
 
 __author__ = "Jeff Forcier <jeff@bitprophet.org>"
-__version__ = "1.10.0"
+__version__ = "1.10.1"
 __license__ = "GNU Lesser General Public License (LGPL)"
 
 

paramiko/agent.py

@@ -130,9 +130,10 @@
                     if len(data) != 0:
                         self.__inr.send(data)
                     else:
+                        self._close()
                         break
                 elif self.__inr == fd:
                     data = self.__inr.recv(512)
                     if len(data) != 0:
                         self._agent._conn.send(data)
                     else:
@@ -133,9 +134,10 @@
                         break
                 elif self.__inr == fd:
                     data = self.__inr.recv(512)
                     if len(data) != 0:
                         self._agent._conn.send(data)
                     else:
+                        self._close()
                         break
             time.sleep(io_sleep)
 
@@ -139,6 +141,11 @@
                         break
             time.sleep(io_sleep)
 
+    def _close(self):
+        self._exit = True
+        self.__inr.close()
+        self._agent._conn.close()
+
 class AgentLocalProxy(AgentProxyThread):
     """
     Class to be used when wanting to ask a local SSH Agent being

setup.py

@@ -52,7 +52,7 @@
 
 
 setup(name = "paramiko",
-      version = "1.10.0",
+      version = "1.10.1",
       description = "SSH2 protocol library",
       author = "Jeff Forcier",
       author_email = "jeff@bitprophet.org",