tor

commit 90fb57ec18c6c19df736097c6f56a00f00951571
parent d1a1d95c4104e00fb29f172d37dec65a8cbb836c
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed,  8 Nov 2017 13:26:50 -0500

Merge branch 'maint-0.3.2'

Diffstat:
M
README
 | 
3
+++
M
src/or/dirvote.c
 | 
2
+-

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/README b/README
@@ -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
@@ -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 */