Merge 3.5

vstinner · vstinner · commit 0e25a8f22502 · 2015-10-01T10:01:31.000+02:00
diff --git a/Python/random.c b/Python/random.c
@@ -111,6 +111,8 @@ py_getentropy(unsigned char *buffer, Py_ssize_t size, int fatal)
 
 #else
 
+/* Issue #25003: Don' use getentropy() on Solaris (available since
+ * Solaris 11.3), it is blocking whereas os.urandom() should not block. */
 #if defined(HAVE_GETRANDOM) || defined(HAVE_GETRANDOM_SYSCALL)
 #define PY_GETRANDOM 1
 
