From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 3 Apr 2011 16:16:50 +0000 (+0200)
Subject: Merge fix for issue #11746
X-Git-Tag: v3.3.0a1~2689
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7caec74aabed6842e5ea608df431a35987195c0;p=python

Merge fix for issue #11746
---

a7caec74aabed6842e5ea608df431a35987195c0
diff --cc Misc/NEWS
index bba0f449cd,7d817fee8a..9fa8853cef
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -87,12 -49,9 +87,15 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #11746: Fix SSLContext.load_cert_chain() to accept elliptic curve
+   private keys.
+ 
 +- Issue #5863: Rewrite BZ2File in pure Python, and allow it to accept
 +  file-like objects using a new ``fileobj`` constructor argument.  Patch by
 +  Nadeem Vawda.
 +
 +- unittest.TestCase.assertSameElements has been removed.
 +
  - sys.getfilesystemencoding() raises a RuntimeError if initfsencoding() was not
    called yet: detect bootstrap (startup) issues earlier.