diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-12-25 23:30:28 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-12-25 23:30:28 -0500 |
| commit | 885e8d35c7af65b3e1e598d6f2e951ba84e65928 (patch) | |
| tree | 8babd1d1ce290fd98d43cc948a90001a05ca5c93 /src/or/config.c | |
| parent | 265aab298ad923425e136013f6c439b5fba32558 (diff) | |
| parent | 406d59a9c93e46bcb5be0e0a5c087f4860522d56 (diff) | |
| download | tor-885e8d35c7af65b3e1e598d6f2e951ba84e65928.tar tor-885e8d35c7af65b3e1e598d6f2e951ba84e65928.tar.gz | |
Merge remote-tracking branch 'mikeperry/209-path-bias-changes'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index db4e1bf90..2947d1cf1 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -314,11 +314,16 @@ static config_var_t option_vars_[] = { VPORT(ORPort, LINELIST, NULL), V(OutboundBindAddress, LINELIST, NULL), + OBSOLETE("PathBiasDisableRate"), V(PathBiasCircThreshold, INT, "-1"), V(PathBiasNoticeRate, DOUBLE, "-1"), - V(PathBiasDisableRate, DOUBLE, "-1"), + V(PathBiasWarnRate, DOUBLE, "-1"), + V(PathBiasExtremeRate, DOUBLE, "-1"), V(PathBiasScaleThreshold, INT, "-1"), V(PathBiasScaleFactor, INT, "-1"), + V(PathBiasMultFactor, INT, "-1"), + V(PathBiasDropGuards, AUTOBOOL, "0"), + V(PathBiasUseCloseCounts, AUTOBOOL, "1"), OBSOLETE("PathlenCoinWeight"), V(PerConnBWBurst, MEMUNIT, "0"), |