commit f7748131296e2779451fa3ff169009821f54ef1f Merge: 39eb075 9985a62 Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 2 12:56:37 2015 +0200

Merge remote-tracking branch 'twstrike/compat_libevent_tests'

src/common/compat_libevent.c | 36 +------ src/common/compat_libevent.h | 38 +++++++ src/test/include.am | 2 + src/test/log_test_helpers.c | 95 +++++++++++++++++ src/test/log_test_helpers.h | 27 +++++ src/test/test.c | 2 + src/test/test_compat_libevent.c | 214 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 382 insertions(+), 32 deletions(-)