Merge with 3.2.

diff --cc Misc/NEWS
index ef78ab7cf95598d1b1594eacd479127617358550,c5f78e768610e41187a673c4759316edffb72aab..c780f3d00f3d527f3754095d7e4c1cf9d32e8ab1
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -152,10 -88,7 +152,10 @@@ Librar
  
  - Issue #12002: ftplib's abort() method raises TypeError.
  
- - Issue 11916: Add a number of MacOSX specific definitions to the errno module.
++- Issue #11916: Add a number of MacOSX specific definitions to the errno module.
 +  Patch by Pierre Carrier.
 +
- - Issue 11999: fixed sporadic sync failure mailbox.Maildir due to its trying to
+ - Issue #11999: fixed sporadic sync failure mailbox.Maildir due to its trying to
    detect mtime changes by comparing to the system clock instead of to the
    previous value of the mtime.