Merge remote-tracking branch 'twstrike/compat_libevent_tests'

diff --cc src/test/include.am
Simple merge

diff --cc src/test/test.c
Simple merge