Merge 3.5

Python/random.c

@@ -134,7 +134,7 @@ py_getrandom(void *buffer, Py_ssize_t size, int raise)
     const int flags = GRND_NONBLOCK;
 
     char *dest;
-    int n;
+    long n;
 
     if (!getrandom_works)
         return 0;
@@ -146,7 +146,7 @@ py_getrandom(void *buffer, Py_ssize_t size, int raise)
            to 1024 bytes */
         n = Py_MIN(size, 1024);
 #else
-        n = Py_MIN(size, INT_MAX);
+        n = Py_MIN(size, LONG_MAX);
 #endif
 
         errno = 0;