From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 11 Apr 2015 11:44:45 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a4~115
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=339e3f33b6dad76b2622ffd34fc4b0083936fa24;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

339e3f33b6dad76b2622ffd34fc4b0083936fa24
diff --cc Doc/library/ssl.rst
index acee4310371d,394bc9f24a0e..37130be40e03
--- a/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.