From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 8 Mar 2011 04:00:45 +0000 (-0500)
Subject: Merge remote branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~304
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4560b31bdf1ed633518ebbdd0b3e11ffa1272cf5;p=libevent

Merge remote branch 'origin/patches-2.0'

Conflicts:
	event-internal.h
---

4560b31bdf1ed633518ebbdd0b3e11ffa1272cf5
diff --cc event-internal.h
index 1171bd9e,12ca8bc1..5c6babcc
--- a/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"