commit 57dd950901c51afdc6c9907961467d30081ecb5d Author: teor <teor2345@gmail.com> Date: Fri May 4 14:04:28 2018 +1000 Remove all DownloadSchedule torrc options Chutney used to set these options to 0, ... Tor's default for these options is 0, ... (Except for ClientBootstrapConsensusAuthorityDownloadSchedule, which chutney doesn't use.) Tor 0.2.9 obsoleted these options by moving to exponential backoff, ignoring every delay in the schedule after the first delay. Tor 0.3.4 has replaced these options with aliases, so chutney warns that they aren't real options any more. Closes #25844. --- torrc_templates/bridgeclient.tmpl | 7 ------- torrc_templates/client.tmpl | 10 ---------- torrc_templates/relay-non-dir.tmpl | 10 ---------- 3 files changed, 27 deletions(-) diff --git a/torrc_templates/bridgeclient.tmpl b/torrc_templates/bridgeclient.tmpl index 4c10c54..b524efd 100644 --- a/torrc_templates/bridgeclient.tmpl +++ b/torrc_templates/bridgeclient.tmpl @@ -7,10 +7,3 @@ UseBridges 1 #UseMicrodescriptors 0 ${bridges} - -# Like TestingClientDownloadSchedule, but for bridge clients -# Try to download after: -# the minimum initial consensus time to start with, -# a few eager fetches, -# then half the minimum testing consensus interval -TestingBridgeDownloadSchedule 0, 5 diff --git a/torrc_templates/client.tmpl b/torrc_templates/client.tmpl index 3aff6cb..aa86c01 100644 --- a/torrc_templates/client.tmpl +++ b/torrc_templates/client.tmpl @@ -1,12 +1,2 @@ ${include:common.i} SocksPort $socksport - -#NOTE: Setting TestingClientConsensusDownloadSchedule doesn't -# help -- dl_stats.schedule is not DL_SCHED_CONSENSUS -# at boostrap time. -# Try to download after: -# the minimum initial consensus time to start with, -# a few eager fetches, -# then half the minimum testing consensus interval -TestingClientDownloadSchedule 0, 5 -TestingClientConsensusDownloadSchedule 0, 5 diff --git a/torrc_templates/relay-non-dir.tmpl b/torrc_templates/relay-non-dir.tmpl index 560ebdf..848bc38 100644 --- a/torrc_templates/relay-non-dir.tmpl +++ b/torrc_templates/relay-non-dir.tmpl @@ -6,16 +6,6 @@ Address $ip # Must be included before exit-v{4,6}.i ExitRelay 0 -#NOTE: Setting TestingServerConsensusDownloadSchedule doesn't -# help -- dl_stats.schedule is not DL_SCHED_CONSENSUS -# at boostrap time. -# Try to download after: -# the minimum initial consensus time to start with, -# a few eager fetches, -# then half the minimum testing consensus interval -TestingServerDownloadSchedule 0, 5 -TestingServerConsensusDownloadSchedule 0, 5 - # These options are set here so they apply to IPv4 and IPv6 Exits # # Tell Exits to avoid using DNS: otherwise, chutney will fail if DNS fails