[tor-commits] [tor/master] Merge branch 'maint-0.4.2'

[nickm at torproject.org]

commit 1cdc030c3d3afbe16461271a1147397f87ba5693
Merge: 91413e04b 2ed194c9a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 22 14:47:28 2019 -0400

    Merge branch 'maint-0.4.2'

 changes/bug32108             | 8 ++++++++
 src/core/mainloop/mainloop.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)