commit 466259eb5083cbab203b56c55a4da2e6515d8767 Merge: 9a0bc46 e7b70b6 Author: Nick Mathewson nickm@torproject.org Date: Fri Jul 8 09:57:31 2016 -0400

Merge remote-tracking branch 'sebastian/libevent2'

Makefile.am | 2 +- changes/bug19554 | 4 + configure.ac | 59 +- scripts/maint/redox.py | 2 - src/common/compat_libevent.c | 222 +-- src/common/compat_libevent.h | 55 +- src/common/procmon.c | 18 +- src/common/timers.c | 4 - src/ext/README | 7 - src/ext/eventdns.c | 3514 --------------------------------------- src/ext/eventdns.h | 337 ---- src/ext/include.am | 1 - src/or/config.c | 2 - src/or/control.c | 4 - src/or/cpuworker.c | 4 - src/or/dns.c | 72 +- src/or/dnsserv.c | 4 - src/or/eventdns_tor.h | 22 - src/or/include.am | 8 - src/or/main.c | 4 - src/or/ntmain.c | 4 - src/or/periodic.c | 4 - src/or/scheduler.c | 4 - src/test/test-timers.c | 4 - src/test/test_compat_libevent.c | 102 +- src/test/test_scheduler.c | 11 - src/test/test_workqueue.c | 4 - src/win32/orconfig.h | 14 - 28 files changed, 44 insertions(+), 4448 deletions(-)