merge 3.4

benjaminp · benjaminp · commit 83711e9bdf47 · 2014-11-23T20:17:06.000-06:00
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -191,6 +191,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #22921: Allow SSLContext to take the *hostname* parameter even if
+  OpenSSL doesn't support SNI.
+
 - Issue #22894: TestCase.subTest() would cause the test suite to be stopped
   when in failfast mode, even in the absence of failures.
 
