merge 3.4; backout changeset 3435c5865cfc due to buildbot failures. Ref #8797

diff --cc Misc/NEWS
index 43c4b3f43dd56f30d5fedf36bee3a4b14a671be3,18e5a6d1054adf0f8a1708709ea985c902adec61..66fc45e90e8a38a58a6aa212904552a9f17c3bfe
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -115,11 -27,6 +115,8 @@@ Core and Builtin
  Library
  -------
  
- - Issue #8797: Raise HTTPError on failed Basic Authentication immediately.
-   Initial patch by Sam Bull.
- 
 +- Issue #15381: Optimized line reading in io.BytesIO.
 +
  - Issue #20729: Restored the use of lazy iterkeys()/itervalues()/iteritems()
    in the mailbox module.