Merge remote branch 'origin/patches-2.0'

Conflicts:
	event-internal.h

diff --cc event-internal.h
index 1171bd9e7294eb4504b45044013ab12308c07475,12ca8bc194d09a9498cdb7c4c85c98620d7fdc9f..5c6babcce98dc63d52b1bc2a19443f57c6f2d00c
--- 1/event-internal.h
--- 2/event-internal.h
+++ b/event-internal.h
@@@ -32,8 -32,7 +32,9 @@@ extern "C" 
  #endif
  
  #include "event2/event-config.h"
 +#include "evconfig-private.h"
 +
+ #include <time.h>
  #include <sys/queue.h>
  #include "event2/event_struct.h"
  #include "minheap-internal.h"

diff --cc event.c
Simple merge