Patch from Karsten to implement proposal 135 ("Testing Tor Networks").

svn:r15253
This commit is contained in:
Nick Mathewson
2008-06-14 16:01:29 +00:00
parent 97c06691b9
commit 0831cc3dbc
8 changed files with 253 additions and 24 deletions
+3 -2
View File
@@ -1308,8 +1308,9 @@ dirvote_recalculate_timing(or_options_t *options, time_t now)
vote_delay = consensus->vote_seconds;
dist_delay = consensus->dist_seconds;
} else {
interval = DEFAULT_VOTING_INTERVAL_WHEN_NO_CONSENSUS;
vote_delay = dist_delay = 300;
interval = options->V3AuthInitialVotingInterval;
vote_delay = options->V3AuthInitialVoteDelay;
dist_delay = options->V3AuthInitialDistDelay;
}
tor_assert(interval > 0);