diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-08 13:26:50 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-08 13:26:50 -0500 |
| commit | c99fec4999a31a56cd6a6cf573c589c5cd690830 (patch) | |
| tree | aee7dae2592fe10d23592d74a52671b7f9359a59 | |
| parent | d37bc728732cd0062669b5f0abc44fc0e1c6ef3d (diff) | |
| parent | 61330f40a50e304b7d7f386ab86a27292a4aa543 (diff) | |
| download | tor-c99fec4999a31a56cd6a6cf573c589c5cd690830.tar.gz tor-c99fec4999a31a56cd6a6cf573c589c5cd690830.zip | |
Merge branch 'maint-0.3.2' into release-0.3.2
| -rw-r--r-- | README | 3 | ||||
| -rw-r--r-- | src/or/dirvote.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -27,3 +27,6 @@ Frequently Asked Questions: To get started working on Tor development: See the doc/HACKING directory. + +Release timeline: + https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam/CoreTorReleases diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 33e5ea7d51..f2194ed6e6 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2878,7 +2878,7 @@ dirvote_recalculate_timing(const or_options_t *options, time_t now) voting_schedule_t *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); /* Fill in the global static struct now */ |