From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 7 Jul 2018 22:47:35 +0000 (-0700)
Subject: closes bpo-34050: Fix link in SSL docs (GH-8173)
X-Git-Tag: v3.7.1rc1~307
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a912305512efd08cbaa15dc1488fb626c9fec067;p=python

closes bpo-34050: Fix link in SSL docs (GH-8173)

(cherry picked from commit 9c5ba097485c8c643b670acd4026f4382bc92f4b)

Co-authored-by: Marcin Niemira <marcin@niemira.net>
---

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 3964d025eb..99d1d774b4 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -1607,7 +1607,7 @@ to speed up repeated connections from the same clients.
 
    Set the available ciphers for sockets created with this context.
    It should be a string in the `OpenSSL cipher list format
-   <https://wiki.openssl.org/index.php/Manual:Ciphers(1)#CIPHER_LIST_FORMAT>`_.
+   <https://www.openssl.org/docs/manmaster/man1/ciphers.html>`_.
    If no cipher can be selected (because compile-time options or other
    configuration forbids use of all the specified ciphers), an
    :class:`SSLError` will be raised.
diff --git a/Misc/ACKS b/Misc/ACKS
index b1e4ec68e3..dcd0ca77a4 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1775,6 +1775,7 @@ Gordon Worley
 Darren Worrall
 Thomas Wouters
 Daniel Wozniak
+Marcin Niemira
 Wei Wu
 Heiko Wundram
 Doug Wyatt