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

[nickm at torproject.org]

commit 87c79cf01760787bcd9e8616b17babe5a7e4eca4
Merge: 730dce4 e0d5a6e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 12 19:41:59 2011 -0400

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

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