2 files changed, 4 insertions, 0 deletions

diff --git a/Misc/ACKS b/Misc/ACKS
index e40e40b..77baff9 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -876,6 +876,7 @@ Eric Siegerman
 Paul Sijben
 Kirill Simonov
 Nathan Paul Simons
+Adam Simpkins
 Janne Sinkkonen
 George Sipe
 J. Sipprell
diff --git a/Misc/NEWS b/Misc/NEWS
index 642f8be..e489029 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -268,6 +268,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #12803: SSLContext.load_cert_chain() now accepts a password argument
+  to be used if the private key is encrypted.  Patch by Adam Simpkins.
+
 - Issue #11657: Fix sending file descriptors over 255 over a multiprocessing
   Pipe.