diff options
| author | Andrea Shepard <andrea@torproject.org> | 2013-01-28 16:16:45 -0800 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2013-01-28 16:16:45 -0800 |
| commit | 123daffb600cb1b581bee9dd576a980a06926f9c (patch) | |
| tree | 07952acab822f5a86a7d47752ac0f50116a405f8 /src/or/config.c | |
| parent | dfbd19df418347d833df650e68367c96a3aa37ad (diff) | |
| parent | a78542f0c30a6d8a25b3a8c92fec61c04c3feeaf (diff) | |
| download | tor-123daffb600cb1b581bee9dd576a980a06926f9c.tar.gz tor-123daffb600cb1b581bee9dd576a980a06926f9c.zip | |
Merge branch 'bug7802' of ssh://git-rw.torproject.org/mikeperry/tor
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 f61d50d976..0e9c0fd6f1 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -324,7 +324,12 @@ 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"), OBSOLETE("PathlenCoinWeight"), V(PerConnBWBurst, MEMUNIT, "0"), |