commit 2ed194c9a93c9e60ca4d4ff0bbf25acb2cf2c62c Merge: edc3f7063 a7ccd9a99 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 22 14:46:10 2019 -0400

Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2

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