commit f96d191cf36ad07cc9f5ef955fa0e7f33149570d Merge: 8585cc5 f1be33f Author: Nick Mathewson <nickm@torproject.org> Date: Thu Dec 17 16:31:56 2015 -0500 Merge branch '17752_again' src/or/connection_edge.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)