[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.0' into maint-0.4.1

[teor at torproject.org]

commit fb541ffca31d4906642ffb3bbe6bb6079cfcb1c9
Merge: f5461a4bd 026f068bb
Author: teor <teor at torproject.org>
Date:   Thu Jan 16 10:00:40 2020 +1000

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