commit cac495f0ffdb9d6261c0329c41c4e1ceee127cf7 Merge: 183fbc4 ada75d5 Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 28 22:55:08 2016 -0400

Merge branch 'bug20494'

src/or/connection_edge.c | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-)