Merge

diff --cc Lib/inspect.py
Simple merge

diff --cc Lib/test/test_inspect.py
Simple merge

diff --cc Misc/NEWS
index c52149760d3c08bc70fe39a9b476b3a74a88bea3,9168a55be07b5af9a0e27a93ed9bef3dc3c55ccc..d3587ddfae21f21822526b7a7fefe196a6f4e6ff
--- 1/Misc/NEWS
--- 2/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.