From 6f0c9dd7ae0030e9bb68b29432c25701bd16bc27 Mon Sep 17 00:00:00 2001
From: n0npax <marcin@niemirai.net>
Date: Sat, 7 Jul 2018 23:21:40 +0200
Subject: [PATCH] bpo-34050: Fix link in SSL docs

---
 Doc/library/ssl.rst | 2 +-
 Misc/ACKS           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 3964d025eb16ba..99d1d774b4aed4 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 25d1db078105bf..8e1b6f73d706cd 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