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

[nickm at torproject.org]

commit 29136bd7e4a671bf58dcc7c5d8d82fd63f9c66f7
Merge: a035131 02c3209
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 30 11:59:51 2013 -0500

    Merge branch 'bug5956_squashed'

 changes/feature5956 |    8 +++
 doc/tor.1.txt       |   12 ++++
 src/or/config.c     |   13 ++++
 src/or/nodelist.c   |  152 +++++++++++++++++++++++++++++++++++----------------
 src/or/or.h         |    3 +
 src/or/routerlist.c |   90 +++++++++++++++++++++++++-----
 src/or/routerlist.h |    4 +-
 7 files changed, 219 insertions(+), 63 deletions(-)

diff --cc src/or/config.c
index 0e9c0fd,e503645..dcd053f
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -324,13 -323,9 +324,14 @@@ static config_var_t option_vars_[] = 
    V(PathBiasScaleFactor,         INT,      "-1"),
    V(PathBiasMultFactor,          INT,      "-1"),
    V(PathBiasDropGuards,          AUTOBOOL, "0"),
 -  V(PathBiasUseCloseCounts,      AUTOBOOL, "1"),
 +  OBSOLETE("PathBiasUseCloseCounts"),
 +
 +  V(PathBiasUseThreshold,       INT,      "-1"),
 +  V(PathBiasNoticeUseRate,          DOUBLE,   "-1"),
 +  V(PathBiasExtremeUseRate,         DOUBLE,   "-1"),
 +  V(PathBiasScaleUseThreshold,      INT,      "-1"),
  
+   V(PathsNeededToBuildCircuits,  DOUBLE,   "-1"),
    OBSOLETE("PathlenCoinWeight"),
    V(PerConnBWBurst,              MEMUNIT,  "0"),
    V(PerConnBWRate,               MEMUNIT,  "0"),