Merge from 3.4.

diff --cc Misc/NEWS
index 17641ceeab80a3a9c431ecdb1ce867f44a008092,8888f79f2f4eb52787c939963908001f413fb6aa..fc84b5e9b0d7a307ce416c438b97a37e3649169c
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -376,28 -140,12 +374,28 @@@ Librar
    __ne__() now works correctly.
  
  - Issue #19996: :class:`email.feedparser.FeedParser` now handles (malformed)
-   headers with no key rather than amusing the body has started.
+   headers with no key rather than assuming 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.