commit 2be3b8275062e34ef6a2c8d753a01b3137de739e Merge: bdc870e6f fb541ffca Author: teor teor@torproject.org Date: Thu Jan 16 10:00:44 2020 +1000

Merge branch 'maint-0.4.1' into release-0.4.1

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(+)