From 2e8ec222420e1df41f20f0c364d74718ba55d01e Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 16 Jan 2011 18:41:36 +0000
Subject: [PATCH] More SSL-related stuff

---
 Doc/whatsnew/3.2.rst | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst
index d643c75bbb..d9823ca681 100644
--- a/Doc/whatsnew/3.2.rst
+++ b/Doc/whatsnew/3.2.rst
@@ -1194,6 +1194,14 @@ as recommended in public uses of HTTPS.
 
 (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 @@ require changes to your code:
 
   (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`.)
-- 
2.50.1