merge 3.4 (#22959)

diff --cc Lib/http/client.py
Simple merge

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

diff --cc Misc/NEWS
index 840055084d99a696f935f2d940fa7f3d01ca1a57,732236dab5c3ecf1656c080dbbae585331232325..6de856cad265929a780632c083fe7e6a9ecfb5a3
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -194,9 -39,9 +194,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #22959: In the constructor of http.client.HTTPSConnection, prefer the
+   context's check_hostname attribute over the *check_hostname* parameter.
+ 
 +- Issue #22696: Add function :func:`sys.is_finalizing` to know about
 +  interpreter shutdown.
 +
  - Issue #16043: Add a default limit for the amount of data xmlrpclib.gzip_decode
    will return. This resolves CVE-2013-1753.