From: Donald Stufft <donald@stufft.io>
Date: Sun, 23 Mar 2014 23:12:13 +0000 (-0400)
Subject: Merge the patch for issue #21013 into default
X-Git-Tag: v3.5.0a1~2038
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17dcf7531c7d99b737538c4d57005eac36813efc;p=python

Merge the patch for issue #21013 into default
---

17dcf7531c7d99b737538c4d57005eac36813efc
diff --cc Misc/NEWS
index 7a2e4fed24,dfdd194ecf..8657f5a752
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -26,9 -24,9 +26,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #21013: Enhance ssl.create_default_context() when used for server side
+   sockets to provide better security by default.
+ 
 +- Issue #20145: `assertRaisesRegex` and `assertWarnsRegex` now raise a
 +  TypeError if the second argument is not a string or compiled regex.
 +
  - Issue #20633: Replace relative import by absolute import.
  
  - Issue #20980: Stop wrapping exception when using ThreadPool.