[tor-commits] [tor/maint-0.3.4] Merge remote-tracking branch 'github/bug26568_034' into maint-0.3.4

[nickm at torproject.org]

commit 32d9d69350f7fac564f4f4a245c57edd2e5c309a
Merge: d38e47495 dfdf32404
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 3 13:16:37 2018 -0400

    Merge remote-tracking branch 'github/bug26568_034' into maint-0.3.4

 changes/bug26568    | 3 +++
 src/or/connection.c | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)