[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2

[arma at torproject.org]

commit 1eec073f1bd1203935afdaa10a3818b73a668fdc
Merge: f348c1c 4f74979
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed Jul 6 00:48:45 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

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