diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-07-08 09:57:31 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-07-08 09:57:31 -0400 |
| commit | 466259eb5083cbab203b56c55a4da2e6515d8767 (patch) | |
| tree | eed52651709a9103491eea38aafb362dae005967 /src/or/control.c | |
| parent | 9a0bc46225bf9ddea67da5c9e400899e24ddbdd0 (diff) | |
| parent | e7b70b69ec7eeb710a6fe6663617328c84bf8bcb (diff) | |
| download | tor-466259eb5083cbab203b56c55a4da2e6515d8767.tar.gz tor-466259eb5083cbab203b56c55a4da2e6515d8767.zip | |
Merge remote-tracking branch 'sebastian/libevent2'
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/or/control.c b/src/or/control.c index ea7d7b7962..21f48aff12 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -51,11 +51,7 @@ #include <sys/resource.h> #endif -#ifdef HAVE_EVENT2_EVENT_H #include <event2/event.h> -#else -#include <event.h> -#endif #include "crypto_s2k.h" #include "procmon.h" |