merge 3.2

diff --cc Misc/NEWS
index b2e7a56bf77e80707263ba36398b25154b57ce58,5dc8a6491816a72a96e4adb4e825a94c500c03de..09293ca84215d128487b95c50bb2572a1a52d05b
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -81,10 -49,9 +81,13 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #5537: Fix time2isoz() and time2netscape() functions of
+   httplib.cookiejar for expiration year greater than 2038 on 32-bit systems.
+ 
 +- Issue #4391: Use proper gettext plural forms in optparse.
 +
 +- Issue #11127: Raise a TypeError when trying to pickle a socket object.
 +
  - Issue #11563: Connection:close header is sent by requests using URLOpener
    class which helps in closing of sockets after connection is over. Patch
    contributions by Jeff McNeil and Nadeem Vawda.