commit 696cd1cfe25e064ed3ceacf5ea5c7b18264873c6 Merge: 8fa7bce 379de3d Author: Nick Mathewson nickm@torproject.org Date: Thu May 12 18:51:33 2011 -0400

Merge remote-tracking branch 'origin/maint-0.2.2'

changes/bug2503 | 4 ++++ src/or/connection.c | 18 ++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-)