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

[arma at torproject.org]

commit f52fd41842b4ef207f15c693420df7af51a192f6
Merge: 213ba1a e2549c3
Author: Roger Dingledine <arma at torproject.org>
Date:   Sat Oct 13 18:35:05 2012 -0400

    Merge branch 'maint-0.2.3' into release-0.2.3

 changes/bug6024       |    2 +
 changes/bug6341       |    5 +++
 changes/bug6827       |    9 ++++++
 changes/bug6844       |    4 +++
 changes/bug6866       |    4 +++
 changes/bug7014       |    5 +++
 changes/bug7022       |    3 ++
 changes/bug7037       |    6 ++++
 changes/ticket5749    |    3 ++
 doc/tor.1.txt         |   21 +++++++-------
 src/common/util.c     |    2 +-
 src/or/circuitbuild.c |   70 +++++++++++++++++++++++++++++++++++++++---------
 src/or/command.c      |    2 +-
 src/or/config.c       |    3 ++
 src/or/or.h           |    7 +++-
 src/or/relay.c        |    2 +-
 src/or/routerparse.c  |    3 ++
 17 files changed, 123 insertions(+), 28 deletions(-)