[tor-commits] [tor/master] Merge branch 'bug29670_035' into bug29670_041

[asn at torproject.org]

commit 4022b6d6b7a2b5e1260c4bccbad119e8461c0b84
Merge: 180048e01 5cbd71b97
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 4 08:29:05 2019 -0400

    Merge branch 'bug29670_035' into bug29670_041

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