commit 2c155064aaa77d5a59169388c89723b8dd53d589 Merge: 8e05001 16f2e4a Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 2 10:36:15 2013 -0400

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

changes/bug8427 | 5 +++++ src/or/connection.c | 4 ++++ 2 files changed, 9 insertions(+), 0 deletions(-)