Merge

diff --cc Misc/NEWS
index 212b72cab37981e5d5e06d704b47139a0a5acb8f,a3de216ff7d37f074b069a57701b69e7627659b1..f8da3b044c328a4c016a9d11475158eddae5f1c9
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -140,9 -140,8 +140,11 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #11927: SMTP_SSL now uses port 465 by default as documented.  Patch
 +  by Kasun Herath.
 +
+ - Issue #12002: ftplib's abort() method raises TypeError.
+ 
  - Issue 11916: Add a number of MacOSX specific definitions to the errno module.
    Patch by Pierre Carrier.