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

[teor at torproject.org]

commit 54c01119ed59668bfa8ed6ef978201731bef0554
Merge: 83424cb62 841cff6e4
Author: teor <teor at torproject.org>
Date:   Mon Nov 25 12:33:55 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1405' into maint-0.3.5

 changes/bug30344               |  4 ++++
 src/core/mainloop/connection.c | 18 ++++++++++++------
 src/core/mainloop/mainloop.c   | 10 ++++++++++
 3 files changed, 26 insertions(+), 6 deletions(-)