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

[nickm at torproject.org]

commit 8e5d3cab2636aa7a41fd14a09e027cee9fe42df2
Merge: 95ad59f a6688c5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jun 23 15:54:33 2012 -0400

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

 contrib/checkSpace.pl |   10 +++++++++-
 src/or/circuitbuild.c |    3 +--
 src/or/main.c         |    3 +--
 src/or/nodelist.c     |    3 +--
 4 files changed, 12 insertions(+), 7 deletions(-)