merge with 3.1
diff --git a/Misc/NEWS b/Misc/NEWS
index da4a46c..22a3a67 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -83,6 +83,8 @@
 Library
 -------
 
+- Issue #12002: ftplib's abort() method raises TypeError.
+
 - 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.