From 5e1e77a363137cc0010641e19e9cef0d12634bd3 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 18 Sep 2020 19:24:06 -0400 Subject: [PATCH] Make consensus documents valid DistDelay seconds earlier. This will prevent arti from hitting the same issue as https://gitlab.torproject.org/tpo/core/tor/-/issues/25756 --- tor-netdoc/src/netstatus.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tor-netdoc/src/netstatus.rs b/tor-netdoc/src/netstatus.rs index 9c43f7d1c..171e0de95 100644 --- a/tor-netdoc/src/netstatus.rs +++ b/tor-netdoc/src/netstatus.rs @@ -1106,7 +1106,10 @@ impl MDConsensus { n_authorities: None, }; let lifetime = unval.consensus.header.hdr.lifetime.clone(); - let timebound = TimerangeBound::new(unval, lifetime.valid_after..lifetime.valid_until); + let delay = unval.consensus.header.hdr.voting_delay.unwrap_or((0, 0)); + let dist_interval = time::Duration::from_secs(delay.1.into()); + let starting_time = lifetime.valid_after - dist_interval; + let timebound = TimerangeBound::new(unval, starting_time..lifetime.valid_until); Ok(timebound) } }