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

2018-07-08 00:24:20 +02:00 · 2018-07-08 00:24:20 +02:00 · 9c5ba09748
parent 9b50a7f29b
commit 9c5ba09748
2 changed files with 2 additions and 1 deletions
--- 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.
--- 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