From: Michael Foord <michael@voidspace.org.uk>
Date: Thu, 22 Dec 2011 01:15:53 +0000 (+0000)
Subject: Merge
X-Git-Tag: v3.3.0a1~543
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85530aa1c369ce83f59bb2e10b6af34c889894fb;p=thirdparty%2FPython%2Fcpython.git

Merge
---

85530aa1c369ce83f59bb2e10b6af34c889894fb
diff --cc Misc/NEWS
index c52149760d3c,9168a55be07b..d3587ddfae21
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -419,27 -97,11 +419,30 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #13620: Support for Chrome browser in webbrowser.py Patch contributed
 +  by Arnaud Calmettes.
 +
+ - Issue #11829: Fix code execution holes in inspect.getattr_static for
+   metaclasses with metaclasses. Patch by Andreas Stührk.
+ 
 +- Issue #12708: Add starmap() and starmap_async() methods (similar to
 +  itertools.starmap()) to multiprocessing.Pool.  Patch by Hynek Schlawack.
 +
  - Issue #1785: Fix inspect and pydoc with misbehaving descriptors.
  
 +- Issue #13637: "a2b" functions in the binascii module now accept ASCII-only
 +  unicode strings.
 +
 +- Issue #13634: Add support for querying and disabling SSL compression.
 +
 +- Issue #13627: Add support for SSL Elliptic Curve-based Diffie-Hellman
 +  key exchange, through the SSLContext.set_ecdh_curve() method and the
 +  ssl.OP_SINGLE_ECDH_USE option.
 +
 +- Issue #13635: Add ssl.OP_CIPHER_SERVER_PREFERENCE, so that SSL servers
 +  choose the cipher based on their own preferences, rather than on the
 +  client's.
 +
  - Issue #11813: Fix inspect.getattr_static for modules. Patch by Andreas
    Stührk.