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

[teor at torproject.org]

commit 026f068bb3aed9de0f1cc6792f6c9528b7b27db2
Merge: d96b35d66 19954cffd
Author: teor <teor at torproject.org>
Date:   Thu Jan 16 10:00:32 2020 +1000

    Merge branch 'maint-0.3.5' into maint-0.4.0

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