commit c300720bfa107a54c2ce98a6937c0ce192673732 Merge: bcdc002 607b29a Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jun 10 12:28:30 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug9017 | 6 ++++++ src/or/connection_edge.c | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-)