diff options
| -rw-r--r-- | changes/bug8599 | 4 | ||||
| -rw-r--r-- | src/or/config.c | 2 | ||||
| -rw-r--r-- | src/or/nodelist.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/changes/bug8599 b/changes/bug8599 new file mode 100644 index 0000000000..204ef58c3f --- /dev/null +++ b/changes/bug8599 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix some logic errors when the user manually overrides the + PathsNeededToBuildCircuits option in torrc. Fixes bug 8599; bugfix + on 0.2.4.10-alpha. diff --git a/src/or/config.c b/src/or/config.c index 75805d0ce8..6bb3ccb988 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2486,7 +2486,7 @@ options_validate(or_options_t *old_options, or_options_t *options, log_warn(LD_CONFIG, "PathsNeededToBuildCircuits is too low. Increasing " "to 0.25"); options->PathsNeededToBuildCircuits = 0.25; - } else if (options->PathsNeededToBuildCircuits < 0.95) { + } else if (options->PathsNeededToBuildCircuits > 0.95) { log_warn(LD_CONFIG, "PathsNeededToBuildCircuits is too high. Decreasing " "to 0.95"); options->PathsNeededToBuildCircuits = 0.95; diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 5f3b843d02..178f084b69 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -1418,7 +1418,7 @@ get_frac_paths_needed_for_circs(const or_options_t *options, const networkstatus_t *ns) { #define DFLT_PCT_USABLE_NEEDED 60 - if (options->PathsNeededToBuildCircuits >= 1.0) { + if (options->PathsNeededToBuildCircuits >= 0.0) { return options->PathsNeededToBuildCircuits; } else { return networkstatus_get_param(ns, "min_paths_for_circs_pct", |