sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.3.2' into release-0.3.2

This commit is contained in:
Nick Mathewson 2017-11-07 14:01:10 -05:00
parent 0c8eebd90c c58471325a
commit 6d6cd2060f
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/or/dirvote.c
View File

@ -2859,6 +2859,13 @@ static voting_schedule_t voting_schedule;
time_t
dirvote_get_next_valid_after_time(void)
{
/* This is a safe guard in order to make sure that the voting schedule
* static object is at least initialized. Using this function with a zeroed
* voting schedule can lead to bugs. */
if (tor_mem_is_zero((const char *) &voting_schedule,
sizeof(voting_schedule))) {
dirvote_recalculate_timing(get_options(), time(NULL));
}
return voting_schedule.interval_starts;
}

8
src/or/networkstatus.c
View File

@ -1939,13 +1939,17 @@ networkstatus_set_current_consensus(const char *consensus,
}
if (is_usable_flavor) {
/* The "current" consensus has just been set and it is a usable flavor so
* the first thing we need to do is recalculate the voting schedule static
* object so we can use the timings in there needed by some subsystems
* such as hidden service and shared random. */
dirvote_recalculate_timing(options, now);
nodelist_set_consensus(c);
/* XXXXNM Microdescs: needs a non-ns variant. ???? NM*/
update_consensus_networkstatus_fetch_time(now);
dirvote_recalculate_timing(options, now);
/* Update ewma and adjust policy if needed; first cache the old value */
old_ewma_enabled = cell_ewma_enabled();
/* Change the cell EWMA settings */