commit ab418447eb9838a8a6f5588e374910d753740d0f Merge: 5938804 06f026d Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 15 15:18:15 2011 -0400

Merge branch 'bug2757' into maint-0.2.2

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