nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 06:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.2'

Browse Source
This commit is contained in:
Nick Mathewson 2017-11-08 13:26:50 -05:00
commit 90fb57ec18
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README
View File

@ -27,3 +27,6 @@ Frequently Asked Questions:
To get started working on Tor development: To get started working on Tor development:
See the doc/HACKING directory. See the doc/HACKING directory.
Release timeline:
https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam/CoreTorReleases

2
src/or/dirvote.c
View File

@ -2878,7 +2878,7 @@ dirvote_recalculate_timing(const or_options_t *options, time_t now)
voting_schedule_t *new_voting_schedule; voting_schedule_t *new_voting_schedule;
/* get the new voting schedule */ /* get the new voting schedule */
new_voting_schedule = get_voting_schedule(options, now, LOG_NOTICE); new_voting_schedule = get_voting_schedule(options, now, LOG_INFO);
tor_assert(new_voting_schedule); tor_assert(new_voting_schedule);
/* Fill in the global static struct now */ /* Fill in the global static struct now */