diff options
| author | Linus Nordberg <linus@torproject.org> | 2013-06-05 15:48:57 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@torproject.org> | 2013-06-08 15:31:56 +0200 |
| commit | 933e49a8b29232d4dc2d430b25868ca0ffea6caf (patch) | |
| tree | 3e64af6fbdcbae36fc4c03d3ef2d07a7fe1dfa15 /torrc_templates | |
| parent | 2ce7c427d1e916b083c81781a17beb35dc5713e2 (diff) | |
| download | chutney-933e49a8b29232d4dc2d430b25868ca0ffea6caf.tar chutney-933e49a8b29232d4dc2d430b25868ca0ffea6caf.tar.gz | |
Use new Tor option TestingV3AuthVotingStartOffset to bootstrap quicker.
Note that this match makes us require Tor with support for
TestingV3AuthVotingStartOffset, something which is not in any released
Tor yet.
Note also that the way TestingV3AuthVotingStartOffset is set in the
torrc's is not very Chutneyesk -- it should use the templating system.
Diffstat (limited to 'torrc_templates')
| -rw-r--r-- | torrc_templates/authority.tmpl | 4 | ||||
| -rw-r--r-- | torrc_templates/client.tmpl | 4 | ||||
| -rw-r--r-- | torrc_templates/relay.tmpl | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/torrc_templates/authority.tmpl b/torrc_templates/authority.tmpl index 6e18d86..7bf99af 100644 --- a/torrc_templates/authority.tmpl +++ b/torrc_templates/authority.tmpl @@ -3,3 +3,7 @@ AuthoritativeDirectory 1 V3AuthoritativeDirectory 1 ContactInfo auth${nodenum}@test.test ExitPolicy reject *:* +TestingV3AuthInitialVotingInterval 300 +TestingV3AuthInitialVoteDelay 2 +TestingV3AuthInitialDistDelay 2 +TestingV3AuthVotingStartOffset 0 diff --git a/torrc_templates/client.tmpl b/torrc_templates/client.tmpl index aa86c01..1eb1d99 100644 --- a/torrc_templates/client.tmpl +++ b/torrc_templates/client.tmpl @@ -1,2 +1,6 @@ ${include:common.i} SocksPort $socksport +#NOTE: Setting TestingClientConsensusDownloadSchedule doesn't +# help -- dl_stats.schedule is not DL_SCHED_CONSENSUS +# at boostrap time. +TestingClientDownloadSchedule 10, 2, 2, 4, 4, 8, 13, 18, 25, 40, 60 diff --git a/torrc_templates/relay.tmpl b/torrc_templates/relay.tmpl index 09dd1f0..2f4b7f1 100644 --- a/torrc_templates/relay.tmpl +++ b/torrc_templates/relay.tmpl @@ -3,3 +3,7 @@ SocksPort 0 OrPort $orport Address $ip DirPort $dirport +#NOTE: Setting TestingServerConsensusDownloadSchedule doesn't +# help -- dl_stats.schedule is not DL_SCHED_CONSENSUS +# at boostrap time. +TestingServerDownloadSchedule 10, 2, 2, 4, 4, 8, 13, 18, 25, 40, 60 |