merge 3.4

diff --cc Doc/library/ssl.rst
index acee4310371d6fa59065e1bdf003216616bfe367,394bc9f24a0eae611fd59604ca91a45f8bfcc283..37130be40e0307168000b35f5f4e0a640d42fa39
--- 1/Doc/library/ssl.rst
--- 2/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@@ -337,11 -335,9 +337,11 @@@ Random generatio
     See http://egd.sourceforge.net/ or http://prngd.sourceforge.net/ for sources
     of entropy-gathering daemons.
  
 +   Availability: not available with LibreSSL.
 +
  .. function:: RAND_add(bytes, entropy)
  
-    Mixes the given *bytes* into the SSL pseudo-random number generator.  The
+    Mix the given *bytes* into the SSL pseudo-random number generator.  The
     parameter *entropy* (a float) is a lower bound on the entropy contained in
     string (so you can always use :const:`0.0`).  See :rfc:`1750` for more
     information on sources of entropy.