diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-06-13 12:42:49 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-06-13 12:42:49 -0400 |
| commit | 45424b2ca1638d5b3d147bb518c092a41028e259 (patch) | |
| tree | 867615adfef97807842059ffb2fade77c08dc60b /src/or/dirserv.c | |
| parent | 4b781e24fb920ad4cd2268b609e4b4b0bd5adb7d (diff) | |
| parent | c132427db4f207a32e4abaae0e070840e5e2b808 (diff) | |
| download | tor-45424b2ca1638d5b3d147bb518c092a41028e259.tar tor-45424b2ca1638d5b3d147bb518c092a41028e259.tar.gz | |
Merge remote-tracking branch 'linus/bug8532'
Diffstat (limited to 'src/or/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 9d6d9ccf4..97fe06884 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3093,7 +3093,8 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, else last_consensus_interval = options->TestingV3AuthInitialVotingInterval; v3_out->valid_after = - dirvote_get_start_of_next_interval(now, (int)last_consensus_interval); + dirvote_get_start_of_next_interval(now, (int)last_consensus_interval, + options->TestingV3AuthVotingStartOffset); format_iso_time(tbuf, v3_out->valid_after); log_notice(LD_DIR,"Choosing valid-after time in vote as %s: " "consensus_set=%d, last_interval=%d", |