[tor-commits] [tor/master] Merge remote branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit 4dde69a6d003682217c2bf6327b5923c7b811974
Merge: c42bd52 ab41844
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 15 15:19:38 2011 -0400

    Merge remote branch 'origin/maint-0.2.2'

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