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

[arma at torproject.org]

commit ab8c0d4c9e23b1c4e2d9e56d87b1b61505a2a8db
Merge: 7295ad1 4f74979
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed Jul 6 00:49:11 2011 -0400

    Merge branch 'maint-0.2.2'

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