Merge proposal 336-randomize-guard-retries.md

5 files changed, 31 insertions, 5 deletions

diff --git a/guard-spec.txt b/guard-spec.txt
index 357583b..9a15eb8 100644
--- a/guard-spec.txt
+++ b/guard-spec.txt
@@ -719,12 +719,32 @@ A.1.  Parameters with suggested values. [Section:PARAM_VALS]
    {param:N_PRIMARY_GUARDS} -- 3
 
    {param:PRIMARY_GUARDS_RETRY_SCHED}
+
+      We recommend the following schedule, which is the one
+      used in Arti:
+
+      -- Use the "decorrelated-jitter" algorithm from "dir-spec.txt"
+         section 5.5 where `base_delay` is 30 seconds and `cap`
+         is 6 hours.
+
+      This legacy schedule is the one used in C tor:
+
       -- every 10 minutes for the first six hours,
       -- every 90 minutes for the next 90 hours,
       -- every 4 hours for the next 3 days,
       -- every 9 hours thereafter.
 
    {param:GUARDS_RETRY_SCHED} --
+
+      We recommend the following schedule, which is the one
+      used in Arti:
+
+      -- Use the "decorrelated-jitter" algorithm from "dir-spec.txt"
+         section 5.5 where `base_delay` is 10 minutes and `cap`
+         is 36 hours.
+
+      This legacy schedule is the one used in C tor:
+
       -- every hour for the first six hours,
       -- every 4 hours for the 90 hours,
       -- every 18 hours for the next 3 days,
diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index 2a43124..f33b756 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -256,7 +256,7 @@ Proposals by number:
 333  Vanguards lite [FINISHED]
 334  A Directory Authority Flag To Mark Relays As Middle-only [SUPERSEDED]
 335  An authority-only design for MiddleOnly [CLOSED]
-336  Randomized schedule for guard retries [ACCEPTED]
+336  Randomized schedule for guard retries [CLOSED]
 337  A simpler way to decide, "Is this guard usable?" [ACCEPTED]
 338  Use an 8-byte timestamp in NETINFO cells [ACCEPTED]
 339  UDP traffic over Tor [ACCEPTED]
@@ -314,7 +314,6 @@ Proposals by status:
    312  Tor Relay Automatic IPv6 Address Discovery
    313  Tor Relay IPv6 Statistics
    321  Better performance and usability for the MyFamily option (v2)
-   336  Randomized schedule for guard retries
    337  A simpler way to decide, "Is this guard usable?"
    338  Use an 8-byte timestamp in NETINFO cells
    339  UDP traffic over Tor
@@ -431,6 +430,7 @@ Proposals by status:
    318  Limit protover values to 0-63 [in 0.4.5.1-alpha]
    328  Make Relays Report When They Are Overloaded
    335  An authority-only design for MiddleOnly [in 0.4.7.2-alpha]
+   336  Randomized schedule for guard retries
  SUPERSEDED:
    112  Bring Back Pathlen Coin Weight
    113  Simplifying directory authority administration
diff --git a/proposals/336-randomize-guard-retries.md b/proposals/336-randomize-guard-retries.md
index 05cf1c3..0e819d4 100644
--- a/proposals/336-randomize-guard-retries.md
+++ b/proposals/336-randomize-guard-retries.md
@@ -3,9 +3,15 @@ Filename: 336-randomize-guard-retries.md
 Title: Randomized schedule for guard retries
 Author: Nick Mathewson
 Created: 2021-10-22
-Status: Accepted
+Status: Closed
 ```
 
+# Implementation Status
+
+> This proposal is implemented in Arti, and recommended for future
+> guard implementations.  We have no current plans to implement it in
+> C Tor.
+
 # Introduction
 
 When we notice that a guard isn't working, we don't mark it as retriable
diff --git a/proposals/BY_INDEX.md b/proposals/BY_INDEX.md
index 54287eb..3c0856a 100644
--- a/proposals/BY_INDEX.md
+++ b/proposals/BY_INDEX.md
@@ -253,7 +253,7 @@ Below are a list of proposals sorted by their proposal number.  See
 * [`333-vanguards-lite.md`](/proposals/333-vanguards-lite.md): Vanguards lite [FINISHED]
 * [`334-middle-only-flag.txt`](/proposals/334-middle-only-flag.txt): A Directory Authority Flag To Mark Relays As Middle-only [SUPERSEDED]
 * [`335-middle-only-redux.md`](/proposals/335-middle-only-redux.md): An authority-only design for MiddleOnly [CLOSED]
-* [`336-randomize-guard-retries.md`](/proposals/336-randomize-guard-retries.md): Randomized schedule for guard retries [ACCEPTED]
+* [`336-randomize-guard-retries.md`](/proposals/336-randomize-guard-retries.md): Randomized schedule for guard retries [CLOSED]
 * [`337-simpler-guard-usability.md`](/proposals/337-simpler-guard-usability.md): A simpler way to decide, "Is this guard usable?" [ACCEPTED]
 * [`338-netinfo-y2038.md`](/proposals/338-netinfo-y2038.md): Use an 8-byte timestamp in NETINFO cells [ACCEPTED]
 * [`339-udp-over-tor.md`](/proposals/339-udp-over-tor.md): UDP traffic over Tor [ACCEPTED]
diff --git a/proposals/README.md b/proposals/README.md
index dcc0d1a..f07399f 100644
--- a/proposals/README.md
+++ b/proposals/README.md
@@ -55,7 +55,6 @@ implementation.
 * [`312-relay-auto-ipv6-addr.txt`](/proposals/312-relay-auto-ipv6-addr.txt): Tor Relay Automatic IPv6 Address Discovery
 * [`313-relay-ipv6-stats.txt`](/proposals/313-relay-ipv6-stats.txt): Tor Relay IPv6 Statistics
 * [`321-happy-families.md`](/proposals/321-happy-families.md): Better performance and usability for the MyFamily option (v2)
-* [`336-randomize-guard-retries.md`](/proposals/336-randomize-guard-retries.md): Randomized schedule for guard retries
 * [`337-simpler-guard-usability.md`](/proposals/337-simpler-guard-usability.md): A simpler way to decide, "Is this guard usable?"
 * [`338-netinfo-y2038.md`](/proposals/338-netinfo-y2038.md): Use an 8-byte timestamp in NETINFO cells
 * [`339-udp-over-tor.md`](/proposals/339-udp-over-tor.md): UDP traffic over Tor
@@ -242,6 +241,7 @@ necessary.
 * [`318-limit-protovers.md`](/proposals/318-limit-protovers.md): Limit protover values to 0-63
 * [`328-relay-overload-report.md`](/proposals/328-relay-overload-report.md): Make Relays Report When They Are Overloaded
 * [`335-middle-only-redux.md`](/proposals/335-middle-only-redux.md): An authority-only design for MiddleOnly
+* [`336-randomize-guard-retries.md`](/proposals/336-randomize-guard-retries.md): Randomized schedule for guard retries
 
 
 ## RESERVE proposals: saving for later