Merge branch 'bug5956_squashed'

diff --cc doc/tor.1.txt
Simple merge

diff --cc src/or/config.c
index 0e9c0fd6f14b87a33ade37cb11fc54158790658b,e503645468f39e4ce4f260ca36a7c70540ebdf55..dcd053ff62e9210695406f52d4d9503b46d449e2
--- 1/src/or/config.c
--- 2/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"),

diff --cc src/or/or.h
Simple merge