commit c366e1fa322625fa96a9c7114bb63a002d016e27 Merge: 9b6e572 517e0f9 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 23 10:27:01 2015 -0400

Merge remote-tracking branch 'public/remove_old_libevent_autoconf_stuff'

changes/deprecated-libevents | 3 ++ configure.ac | 16 +------- src/common/compat_libevent.c | 88 ++---------------------------------------- src/common/compat_libevent.h | 7 ---- src/or/config.c | 12 ------ 5 files changed, 8 insertions(+), 118 deletions(-)