diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-06-14 16:01:29 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-06-14 16:01:29 +0000 |
| commit | 0831cc3dbcb89fc356c69ced54374aaebbb4fd39 (patch) | |
| tree | ddaef3136993718975581cb0dbaeb95307c0c72f /src/or/dirvote.c | |
| parent | 97c06691b9f4a30db21fcba41c17b95e268b24a0 (diff) | |
| download | tor-0831cc3dbcb89fc356c69ced54374aaebbb4fd39.tar.gz tor-0831cc3dbcb89fc356c69ced54374aaebbb4fd39.zip | |
Patch from Karsten to implement proposal 135 ("Testing Tor Networks").
svn:r15253
Diffstat (limited to 'src/or/dirvote.c')
| -rw-r--r-- | src/or/dirvote.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 421f9c26c9..291d3dc4a6 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -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); |