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

[nickm at torproject.org]

commit 0c5a44ed0a790951bdfd319eec734c04eb972a08
Merge: e232938 bffe0d3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 27 16:16:27 2012 -0400

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

 changes/bug6710       |    6 ++++++
 doc/tor.1.txt         |    6 ++++++
 src/or/circuitbuild.c |    7 +++++++
 src/or/config.c       |    2 ++
 src/or/or.h           |    4 +++-
 5 files changed, 24 insertions(+), 1 deletions(-)