summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2019-08-16 15:59:48 +0200
committeranonym <anonym@riseup.net>2019-08-16 15:59:48 +0200
commit80d971bbf27752747b0be99646a38d881f237ed8 (patch)
tree5ef50998f4a438005b6635ae157e4c75a84846d3
parent39e26bd4f29589c2024965382ab400909f17dd2c (diff)
parentebc2127b1113e49ba0fa85f15cbd46064bde4af7 (diff)
Merge branch 'stable' into develdevel
-rwxr-xr-xconfig/chroot_local-includes/etc/NetworkManager/dispatcher.d/20-time.sh2
-rw-r--r--wiki/src/contribute/design/Time_syncing.mdwn5
2 files changed, 3 insertions, 4 deletions
diff --git a/config/chroot_local-includes/etc/NetworkManager/dispatcher.d/20-time.sh b/config/chroot_local-includes/etc/NetworkManager/dispatcher.d/20-time.sh
index aac1168..18c7f6b0 100755
--- a/config/chroot_local-includes/etc/NetworkManager/dispatcher.d/20-time.sh
+++ b/config/chroot_local-includes/etc/NetworkManager/dispatcher.d/20-time.sh
@@ -121,7 +121,7 @@ time_is_in_valid_tor_range() {
local curdate="$1"
local vstart="$2"
- vendcons=$(date -ud "${vstart} -0230" +'%F %T')
+ vendcons=$(date -ud "${vstart} -0255" +'%F %T')
order="${vstart}
${curdate}
${vendcons}"
diff --git a/wiki/src/contribute/design/Time_syncing.mdwn b/wiki/src/contribute/design/Time_syncing.mdwn
index 021b3c6..e5eb275 100644
--- a/wiki/src/contribute/design/Time_syncing.mdwn
+++ b/wiki/src/contribute/design/Time_syncing.mdwn
@@ -24,8 +24,7 @@ using Tor so we can make Tor usable.
In short this is how time syncing is performed when Tails starts:
0. Start Tor. If Tor is already working, skip to HTP step.
-0. Let Tor fetch a consensus (wait up to 150 seconds twice, restarting Tor
- in between).
+0. Let Tor fetch a consensus.
0. If the time is too badly off, the authority certificate may not be
valid, so we set the system time to the `valid-after` of the unverified
consensus Tor fetched for us, which will guarantee that the certificate
@@ -53,7 +52,7 @@ file contains such information:
valid-until 2010-12-27 19:00:00
A consensus is valid for three hours. If the system time is in the
-[valid-after, valid-after + 2.5 hours] range, `tordate` exits.
+[valid-after, valid-after + 2 hours + 55 minutes] range, `tordate` exits.
Else, it sets the system time to the middle of the [valid-after,
fresh-until] range and restarts Tor.