More SSL-related stuff
diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst
index d643c75..d9823ca 100644
--- a/Doc/whatsnew/3.2.rst
+++ b/Doc/whatsnew/3.2.rst
@@ -1194,6 +1194,14 @@
(Added by Antoine Pitrou, :issue:`9003`.)
+imaplib
+-------
+
+Support for explicit TLS on standard IMAP4 connections has been added through
+the new :mod:`imaplib.IMAP4.starttls` method.
+
+(Contributed by Lorenzo M. Catucci and Antoine Pitrou, :issue:`4471`.)
+
unittest
--------
@@ -1904,3 +1912,7 @@
(Contributed by Antoine Pitrou, :issue:`10711`.)
+* SSL sockets in timeout mode now raise :exc:`socket.timeout` when a timeout
+ occurs, rather than a generic :exc:`~ssl.SSLError`.
+
+ (Contributed by Antoine Pitrou, :issue:`10272`.)