Переглянути джерело

Merge branch 'maint-0.3.2'

Nick Mathewson 6 роки тому
батько
коміт
90fb57ec18
2 змінених файлів з 4 додано та 1 видалено
  1. 3 0
      README
  2. 1 1
      src/or/dirvote.c

+ 3 - 0
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

+ 1 - 1
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 */