merge with 3.4

diff --cc Lib/test/test_httplib.py
index 8142c0e4498d07deace27d36357bd776dabf2348,d259fb28533ac6bfee1bb0ce48a853485444a685..93c2212b6e4847c233ac97bd2a4665e979fa8580
--- 1/Lib/test/test_httplib.py
--- 2/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@@ -15,29 -15,9 +15,29 @@@ here = os.path.dirname(__file__
  CERT_localhost = os.path.join(here, 'keycert.pem')
  # Self-signed cert file for 'fakehostname'
  CERT_fakehostname = os.path.join(here, 'keycert2.pem')
- # Root cert file (CA) for svn.python.org's cert
- CACERT_svn_python_org = os.path.join(here, 'https_svn_python_org_root.pem')
+ # Self-signed cert file for self-signed.pythontest.net
+ CERT_selfsigned_pythontestdotnet = os.path.join(here, 'selfsigned_pythontestdotnet.pem')
  
 +# constants for testing chunked encoding
 +chunked_start = (
 +    'HTTP/1.1 200 OK\r\n'
 +    'Transfer-Encoding: chunked\r\n\r\n'
 +    'a\r\n'
 +    'hello worl\r\n'
 +    '3\r\n'
 +    'd! \r\n'
 +    '8\r\n'
 +    'and now \r\n'
 +    '22\r\n'
 +    'for something completely different\r\n'
 +)
 +chunked_expected = b'hello world! and now for something completely different'
 +chunk_extension = ";foo=bar"
 +last_chunk = "0\r\n"
 +last_chunk_extended = "0" + chunk_extension + "\r\n"
 +trailers = "X-Dummy: foo\r\nX-Dumm2: bar\r\n"
 +chunked_end = "\r\n"
 +
  HOST = support.HOST
  
  class FakeSocket: