From: Senthil Kumaran <senthil@uthcode.com>
Date: Tue, 10 May 2016 08:29:34 +0000 (-0700)
Subject: Add NEWS entry for issue26960.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09f1679a401a94b0626ab1e100aaaea271dbf3c0;p=python

Add NEWS entry for issue26960.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 0f55e76079..52ad068c34 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -77,6 +77,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #26960: Backported #16270 from Python 3 to Python 2, to prevent urllib
+  from hanging when retrieving certain FTP files.
+
 - Issue #25745: Fixed leaking a userptr in curses panel destructor.
 
 - Issue #17765: weakref.ref() no longer silently ignores keyword arguments.