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

[teor at torproject.org]

commit a92b05392e2e88357b0e2a1c31cfdb7e94406838
Merge: 224825e7e 5cbd71b97
Author: teor <teor at torproject.org>
Date:   Mon Aug 12 09:51:35 2019 +1000

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

 changes/bug29670               |  4 ++++
 src/core/mainloop/connection.c | 33 +++++++++++++++++++++------------
 2 files changed, 25 insertions(+), 12 deletions(-)