[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

https://hg.python.org/cpython/rev/8cb4d114ae82
changeset:   93565:8cb4d114ae82
parent:      93560:fc81a4b381e1
parent:      93564:060fd5d09063
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Nov 23 20:17:06 2014 -0600
summary:
  merge 3.4

files:
  Misc/NEWS |  3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -191,6 +191,9 @@
 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.
 

-- 
Repository URL: https://hg.python.org/cpython