[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4

[nickm at torproject.org]

commit 5b0820702a213226d2cce47dae1da5e72a16bc82
Merge: 9b060547c 32d9d6935
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 3 13:31:18 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

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