commit 6eba3584b17abecfcb2e53058dc8e3ea59a0e480 Merge: 8d5215c f3e8271 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Feb 21 17:29:48 2014 +0000 Merge remote-tracking branch 'public/bug10987_024' changes/bug10987 | 7 +++++++ src/or/connection_edge.c | 25 ++++++++++++++++++------- 2 files changed, 25 insertions(+), 7 deletions(-)