From: Christian Heimes <christian@cheimes.de>
Date: Mon, 17 Jun 2013 13:45:11 +0000 (+0200)
Subject: merge heads
X-Git-Tag: v3.4.0a1~463
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ce4f36aa1e901cd6d61209b37d18602d1e27cc7;p=python

merge heads
---

9ce4f36aa1e901cd6d61209b37d18602d1e27cc7
diff --cc Misc/NEWS
index 9b60b3b437,3f327707e3..aa7692348b
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -123,10 -123,9 +123,13 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #18147: Add diagnostic functions to ssl.SSLContext(). get_ca_list()
 +  lists all loaded CA certificates and cert_store_stats() returns amount of
 +  loaded X.509 certs, X.509 CA certs and CRLs.
 +
+ - Issue #18167: cgi.FieldStorage no more fails to handle multipart/form-data
+   when \r\n appears at end of 65535 bytes without other newlines.
+ 
  - Issue #18076: Introduce importlib.util.decode_source().
  
  - importlib.abc.SourceLoader.get_source() no longer changes SyntaxError or