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

Conflicts:
	evutil_rand.c

configure.in

@@ -44,6 +44,7 @@ dnl the 'host' machine is where the resulting stuff runs.
 
 dnl Checks for programs.
 AM_PROG_CC_C_O
+AC_PROG_SED
 AC_PROG_INSTALL
 AC_PROG_LN_S
 # AC_PROG_MKDIR_P - $(MKDIR_P) should be defined by AM_INIT_AUTOMAKE

evutil_rand.c

@@ -65,10 +65,10 @@ evutil_free_secure_rng_globals_locks(void)
 static void
 ev_arc4random_buf(void *buf, size_t n)
 {
-	unsigned char *b = buf;
 #if defined(EVENT__HAVE_ARC4RANDOM_BUF) && !defined(__APPLE__)
 	return arc4random_buf(buf, n);
 #else
+	unsigned char *b = buf;
 
 #if defined(EVENT__HAVE_ARC4RANDOM_BUF)
 	/* OSX 10.7 introducd arc4random_buf, so if you build your program