Merge remote-tracking branch 'sebastian/libevent2'

diff --cc src/or/config.c
Simple merge

diff --cc src/or/control.c
Simple merge

diff --cc src/or/main.c
Simple merge

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