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

[nickm at torproject.org]

commit 09759a66eae044e640f477ebe96b1c3edbb98c94
Merge: 53d02a6 286d444
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 7 11:43:36 2011 -0400

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

 src/or/circuituse.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)