Merge branch master; resolve conflicts

vstinner · Jan 20, 2018 · Jun 3, 2017 · Jun 3, 2017 · Jun 3, 2017 · Jun 4, 2017
commit a021d336a7480daf3e2fe6da31604deed8c22918
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
@@ -1664,7 +1664,11 @@ to speed up repeated connections from the same clients.
 
    Get statistics about the SSL sessions created or managed by this context.
    A dictionary is returned which maps the names of each `piece of information
+<<<<<<< HEAD
    <https://www.openssl.org/docs/manmaster/man3/SSL_CTX_sess_number.html>`_ to their
+=======
+   <https://www.openssl.org/docs/man1.1.0/ssl/SSL_CTX_sess_number.html>`_ to their
+>>>>>>> master
    numeric values.  For example, here is the total number of hits and misses
    in the session cache since the context was created::