[Python-checkins] closes bpo-34050: Fix link in SSL docs (GH-8173)

[Benjamin Peterson]

https://github.com/python/cpython/commit/9c5ba097485c8c643b670acd4026f4382bc92f4b
commit: 9c5ba097485c8c643b670acd4026f4382bc92f4b
branch: master
author: Marcin Niemira <marcin at niemira.net>
committer: Benjamin Peterson <benjamin at python.org>
date: 2018-07-07T15:24:20-07:00
summary:

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

files:
M Doc/library/ssl.rst
M Misc/ACKS

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 3964d025eb16..99d1d774b4ae 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 25d1db078105..8e1b6f73d706 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1784,6 +1784,7 @@ Gordon Worley
 Darren Worrall
 Thomas Wouters
 Daniel Wozniak
+Marcin Niemira
 Wei Wu
 Heiko Wundram
 Doug Wyatt