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

[arma at torproject.org]

commit 688400c596c09e9a6d1a26668e4843ccd946a7be
Merge: 6746293 5f182ea
Author: Roger Dingledine <arma at torproject.org>
Date:   Sun May 29 19:11:22 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

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