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

[nickm at torproject.org]

commit f883ec09b5b2f48cd4186658e0b92f1511358f21
Merge: eee942c 3ab0976
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 7 09:56:01 2011 -0400

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

 changes/bug3536          |    5 +++++
 src/or/connection_edge.c |    3 ++-
 2 files changed, 7 insertions(+), 1 deletions(-)