From ac79f831e1dd465089dc7f8fffdaed6cfdd65c98 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Wed, 8 Nov 2017 10:44:00 -0500 Subject: [PATCH 1/2] doc: Put the release timeline link in README Closes #24134 Signed-off-by: David Goulet --- README | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README b/README index d246a6930..9e0f4b824 100644 --- 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 From 31a907881e2669641f8665452d50ca461dbde2d5 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 8 Nov 2017 11:50:57 -0500 Subject: [PATCH 2/2] downgrade severity for get_voting_schedule() --- src/or/dirvote.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 33e5ea7d5..f2194ed6e 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 */