commit ea893a3c30d0e2ed9198258f65ed30e48da69ebe Merge: 06d367e bfe8d82 Author: Nick Mathewson <nickm@torproject.org> Date: Sun Nov 18 18:46:57 2012 -0500 Merge branch 'bug7493_redux' src/or/connection.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)