summaryrefslogtreecommitdiff
path: root/src/or/networkstatus.c
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@ev0ke.net>2016-04-05 14:43:20 -0400
committerNick Mathewson <nickm@torproject.org>2016-04-07 10:57:59 -0400
commit40827da3bfafb3191433d4151d48f79c511dcd42 (patch)
tree15708670690aa920a99c0b9580ecdbc38795969c /src/or/networkstatus.c
parentd8a056daed78c9794037931db81b97d596505bb7 (diff)
downloadtor-40827da3bfafb3191433d4151d48f79c511dcd42.tar.gz
tor-40827da3bfafb3191433d4151d48f79c511dcd42.zip
Turn TestingClientBootstrap* into non-testing options
This changes simply renames them by removing "Testing" in front of them and they do not require TestingTorNetwork to be enabled anymore. Fixes #18481 Signed-off-by: David Goulet <dgoulet@ev0ke.net>
Diffstat (limited to 'src/or/networkstatus.c')
-rw-r--r--src/or/networkstatus.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 73755b5b42..3967f56edd 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -802,10 +802,10 @@ consensus_max_download_tries(const or_options_t *options,
if (we_are_bootstrapping) {
if (use_fallbacks) {
- return options->TestingClientBootstrapConsensusMaxDownloadTries;
+ return options->ClientBootstrapConsensusMaxDownloadTries;
} else {
return
- options->TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries;
+ options->ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries;
}
}
@@ -850,7 +850,7 @@ update_consensus_networkstatus_downloads(time_t now)
/* Check if we already have enough connections in progress */
if (we_are_bootstrapping) {
max_in_progress_conns =
- options->TestingClientBootstrapConsensusMaxInProgressTries;
+ options->ClientBootstrapConsensusMaxInProgressTries;
}
if (connection_dir_count_by_purpose_and_resource(
DIR_PURPOSE_FETCH_CONSENSUS,