[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.0

[teor at torproject.org]

commit c17ab20ac0d3efb1b9c46fa12685db5b09015481
Merge: ed6f2f61a a7ccd9a99
Author: teor <teor at torproject.org>
Date:   Mon Nov 25 12:36:41 2019 +1000

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

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