commit 19954cffd7710ccac778aa5cf15ae1bc6a5d56fa Merge: 0b3763612 4d70e725d Author: teor teor@torproject.org Date: Thu Jan 16 09:57:27 2020 +1000

Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5

changes/ticket32407 | 4 ++++ src/core/mainloop/mainloop.c | 4 ++++ src/lib/evloop/compat_libevent.c | 10 ++++++++++ src/lib/evloop/compat_libevent.h | 3 +++ 4 files changed, 21 insertions(+)