From 1d57b2238efa91f2a30a40f3071410c8568fd9ae Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@python.org>
Date: Wed, 6 Sep 2017 16:19:56 -0700
Subject: [PATCH] [2.7] bpo-21649: Add RFC 7525 and Mozilla server side TLS
 (GH-3387)

Signed-off-by: Christian Heimes <christian@python.org>
(cherry picked from commit ad0ffa033ea79f7c7cb14b1b1cc10888ea9e9913)
---
 Doc/library/ssl.rst                                         | 6 ++++++
 .../Documentation/2017-09-06-10-11-57.bpo-21649.EUvqA9.rst  | 1 +
 2 files changed, 7 insertions(+)
 create mode 100644 Misc/NEWS.d/next/Documentation/2017-09-06-10-11-57.bpo-21649.EUvqA9.rst

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 183c17bb560d82..36beb1777cf036 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -1810,3 +1810,9 @@ successful call of :func:`~ssl.RAND_add`, :func:`~ssl.RAND_bytes` or
 
    `IANA TLS: Transport Layer Security (TLS) Parameters <https://www.iana.org/assignments/tls-parameters/tls-parameters.xml>`_
        IANA
+
+   `RFC 7525: Recommendations for Secure Use of Transport Layer Security (TLS) and Datagram Transport Layer Security (DTLS) <https://tools.ietf.org/html/rfc7525>`_
+       IETF
+
+   `Mozilla's Server Side TLS recommendations <https://wiki.mozilla.org/Security/Server_Side_TLS>`_
+       Mozilla
diff --git a/Misc/NEWS.d/next/Documentation/2017-09-06-10-11-57.bpo-21649.EUvqA9.rst b/Misc/NEWS.d/next/Documentation/2017-09-06-10-11-57.bpo-21649.EUvqA9.rst
new file mode 100644
index 00000000000000..a09985aa3d8dd7
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2017-09-06-10-11-57.bpo-21649.EUvqA9.rst
@@ -0,0 +1 @@
+Add RFC 7525 and Mozilla server side TLS links to SSL documentation.