merge 3.4 (#19996)

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

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

diff --cc Misc/NEWS
index 3c083630e5a150bd83673d252635e7e790952a2d,06df4db08b5d86d1426ce4fcb4e9791c5c27e0f0..370c2289880eced7909a2225a8193c1dd199cd04
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -215,26 -47,13 +215,29 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #19996: :class:`email.feedparser.FeedParser` now handles (malformed)
+   headers with no key rather than amusing the body has started.
+ 
 +- Issue #20188: Support Application-Layer Protocol Negotiation (ALPN) in the ssl
 +  module.
 +
 +- Issue #23133: Pickling of ipaddress objects now produces more compact and
 +  portable representation.
 +
  - Issue #23248: Update ssl error codes from latest OpenSSL git master.
  
 +- Issue #23266: Much faster implementation of ipaddress.collapse_addresses()
 +  when there are many non-consecutive addresses.
 +
  - Issue #23098: 64-bit dev_t is now supported in the os module.
  
 +- Issue #21817: When an exception is raised in a task submitted to a
 +  ProcessPoolExecutor, the remote traceback is now displayed in the
 +  parent process.  Patch by Claudiu Popa.
 +
 +- Issue #15955: Add an option to limit output size when decompressing LZMA
 +  data.  Patch by Nikolaus Rath and Martin Panter.
 +
  - Issue #23250: In the http.cookies module, capitalize "HttpOnly" and "Secure"
    as they are written in the standard.