commit 7a4069911d427391455e8b75597b504dc478da5c Merge: 634fdf86f 1f3bf10d3 Author: teor teor@torproject.org Date: Thu Nov 7 10:51:43 2019 +1000

Merge branch 'maint-0.4.2' into release-0.4.2

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