commit 47b7a279298c81137430527ed0a72c6a6d3fcd61 Merge: 5d9be49 d861b4c Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 3 13:22:34 2012 -0500

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

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