From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 30 Jan 2013 16:59:51 +0000 (-0500)
Subject: Merge branch 'bug5956_squashed'
X-Git-Tag: tor-0.2.4.10-alpha~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29136bd7e4a671bf58dcc7c5d8d82fd63f9c66f7;p=thirdparty%2Ftor.git

Merge branch 'bug5956_squashed'
---

29136bd7e4a671bf58dcc7c5d8d82fd63f9c66f7
diff --cc src/or/config.c
index 0e9c0fd6f1,e503645468..dcd053ff62
--- 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"),