Merge 3.5

diff --cc Python/random.c
index 8a83fe97737ad507485c6dd26bae0c5120027a87,3119872abd6df20a81726d87b90f9dda94d92bcb..c8e844ee678da131a94ec42fe53f83fe5f4fad17
--- 1/Python/random.c
--- 2/Python/random.c
+++ b/Python/random.c
@@@ -132,9 -132,7 +132,9 @@@ py_getrandom(void *buffer, Py_ssize_t s
       * see https://bugs.python.org/issue26839. To avoid this, use the
       * GRND_NONBLOCK flag. */
      const int flags = GRND_NONBLOCK;
-     int n;
 +
 +    char *dest;
+     long n;
  
      if (!getrandom_works)
          return 0;