[tor-commits] [tor/master] Merge branch 'bug5535_only_rebased'

[nickm at torproject.org]

commit d7a646edcfbceaab412bc1558ec83a3551c2c8a4
Merge: ec94d03 d827a54
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 4 18:24:20 2012 -0400

    Merge branch 'bug5535_only_rebased'

 changes/bug5535       |    5 +++
 doc/tor.1.txt         |   12 ++++++++
 src/or/circuitbuild.c |   72 ++++++++++++++++++++++++++++--------------------
 src/or/config.c       |    2 +
 src/or/nodelist.c     |   53 +++++++++++++++++++++++++++++-------
 src/or/nodelist.h     |    8 +++---
 src/or/or.h           |   11 +++++++
 src/or/routerparse.c  |    9 ++++++
 8 files changed, 128 insertions(+), 44 deletions(-)