merge 3.3 (#20018)

benjaminp · benjaminp · commit fc45f173a348 · 2013-12-18T15:37:03.000-06:00
diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
@@ -1973,7 +1973,7 @@ class MozillaCookieJar(FileCookieJar):
     magic_re = re.compile("#( Netscape)? HTTP Cookie File")
     header = """\
 # Netscape HTTP Cookie File
-# http://www.netscape.com/newsref/std/cookie_spec.html
+# http://curl.haxx.se/rfc/cookie_spec.html
 # This is a generated file!  Do not edit.
 
 """
