merge 3.3 (#21115)

diff --cc Lib/test/test_urllib2net.py
index 3b2f2b8bc1e21d02842f6041a63d9ea17f91fbca,f50a2bb2205f72c1aa824bfc37d1baec0bca0cc5..fd667f23b45d21d093b19cdf00e24ee549d63379
--- 1/Lib/test/test_urllib2net.py
--- 2/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@@ -162,16 -160,8 +162,16 @@@ class OtherNetworkTests(unittest.TestCa
              req = urllib.request.Request(urlwith_frag)
              res = urllib.request.urlopen(req)
              self.assertEqual(res.geturl(),
-                     "http://docs.python.org/2/glossary.html#glossary")
+                     "https://docs.python.org/2/glossary.html#glossary")
  
 +    def test_redirect_url_withfrag(self):
 +        redirect_url_with_frag = "http://bitly.com/urllibredirecttest"
 +        with support.transient_internet(redirect_url_with_frag):
 +            req = urllib.request.Request(redirect_url_with_frag)
 +            res = urllib.request.urlopen(req)
 +            self.assertEqual(res.geturl(),
 +                    "http://docs.python.org/3.4/glossary.html#term-global-interpreter-lock")
 +
      def test_custom_headers(self):
          url = "http://www.example.com"
          with support.transient_internet(url):