merge heads

diff --cc Misc/NEWS
index 9b60b3b4372372a9a5ceb6bb203003b574a450d8,3f327707e3ebd29c8f62a0da56d54a08b7bf1f48..aa7692348b4859b23e37eec0da54ebe9351258be
--- 1/Misc/NEWS
--- 2/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