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

[nickm at torproject.org]

commit d3769dd4d01f282b4ad907de8b48b67f18102f79
Merge: 1c5e7430e bfe8f50cc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 2 09:06:37 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

 changes/bug26470         | 4 ++++
 src/or/connection_edge.c | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)