commit 97246a5b6d6c2e25db14e7a82f4a01b876447101 Merge: a1178cd 39ac1db Author: Nick Mathewson nickm@torproject.org Date: Fri Apr 12 01:13:22 2013 -0400

Merge remote-tracking branch 'public/bug5650_squashed' into maint-0.2.4

changes/bug5650 | 5 +++++ src/or/connection.c | 17 ++++++++++++++++- src/or/or.h | 3 +++ 3 files changed, 24 insertions(+), 1 deletions(-)