commit 792172ffec157594e9e35748a2de83e414ec5ab2 Merge: 23e1c1c35 19954cffd Author: teor teor@torproject.org Date: Thu Jan 16 10:00:28 2020 +1000

Merge branch 'maint-0.3.5' into release-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(+)