commit d2ab58c48dc351f7dc0828f3dc4159627218c75e Merge: 07f2e57 87865c8 Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 14 09:10:34 2016 -0400

Merge branch 'bug18357_v2'

changes/bug18357 | 5 +++++ src/or/connection_edge.c | 38 ++++++++++++++++++++++++++++++-------- 2 files changed, 35 insertions(+), 8 deletions(-)