From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 17 Oct 2014 16:09:13 +0000 (-0500)
Subject: Fix badly merged NEWS item.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47ff6fa6008a565f980079aab44b24da9982b9c2;p=python

Fix badly merged NEWS item.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 4860b24773..bfaffae59f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -37,6 +37,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #20421: Add a .version() method to SSL sockets exposing the actual
+  protocol version in use.
+
 - Issue #22435: Fix a file descriptor leak when SocketServer bind fails.
 
 - Issue #13664: GzipFile now supports non-ascii Unicode filenames.
@@ -283,7 +286,7 @@ Windows
 -------
 
 - Issue #22160: The bundled version of OpenSSL has been updated to 1.0.1i.
-version in use.
+
 
 
 What's New in Python 2.7.8?