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

[nickm at torproject.org]

commit 6bd069630a64e540cb118ad84c2bcbb470ce92f8
Merge: e847909b7 ff0be0805
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 2 09:06:32 2018 -0400

    Merge branch 'bug26470_032' into maint-0.3.3

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