commit 4432fa40dda2a79da7c2d88d2fe83462ed919d7b Merge: 26855fe 1f7f10e Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 18 11:51:55 2012 -0400

Merge remote-tracking branch 'andrea/bug6028'

changes/bug6028 | 4 ++++ src/or/connection.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletions(-)