commit 443df7e0d25710036c4cc821954cfd92386419a3 Merge: 869e15cbf 2ed194c9a Author: Nick Mathewson <nickm@torproject.org> Date: Tue Oct 22 14:47:28 2019 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug32108 | 8 ++++++++ src/core/mainloop/mainloop.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)