Merge remote-tracking branch 'origin/patches-2.0'

diff --cc evutil_rand.c
index 7e7e042be0f0b9538116bca425567635e555b9f3,284341cf393240b0b766a7462c4e0a11e8cf77f3..046a14b07a9a637b2096cd95f129e38dd1196685
--- 1/evutil_rand.c
--- 2/evutil_rand.c
+++ b/evutil_rand.c
@@@ -85,10 -77,10 +85,11 @@@ ev_arc4random_buf(void *buf, size_t n
         * trickery.)
         */
        {
-               void (*tptr)() = (void*)arc4random_buf;
+               void (*tptr)(void *,size_t) =
+                   (void (*)(void*,size_t))arc4random_buf;
                if (tptr != NULL) {
 -                      return arc4random_buf(buf, n);
 +                      arc4random_buf(buf, n);
 +                      return;
                }
        }
  #endif