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

[nickm at torproject.org]

commit ab338e3bb8220de6c38d2b689f2e9593d256e9c4
Merge: 5465ac5 86c4b75
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 11 10:06:49 2012 -0400

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

 changes/bug5593     |    3 +++
 src/or/connection.c |    7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)