summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-03-28 09:33:58 -0400
committerNick Mathewson <nickm@torproject.org>2013-03-28 09:33:58 -0400
commit097a08f6fe61fcdd20bc7a5a57294fe358e68e6a (patch)
treead90c783c4688a8a5a9ce284f63e43944057965c /src/or
parentece9ef7f41224dbad8c36b735c08877e6193c38b (diff)
parent96c0a42a926abec333327c3e9668a5721bab9afc (diff)
downloadtor-097a08f6fe61fcdd20bc7a5a57294fe358e68e6a.tar.gz
tor-097a08f6fe61fcdd20bc7a5a57294fe358e68e6a.zip
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src/or')
-rw-r--r--src/or/config.c2
-rw-r--r--src/or/nodelist.c2
2 files changed, 2 insertions, 2 deletions
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",