merge 3.4

83711e9b · Benjamin Peterson · ff4d94ef · f200498a · 83711e9b
Commit 83711e9b authored Nov 23, 2014 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

Misc/NEWS Misc/NEWS +3 -0

No files found.
--- 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.