[tor-commits] [torspec/master] Merge prop293 and mark it closed.

[nickm at torproject.org]

commit d14164d8b9d7bf53c63f4720d2361a18e2d45e0e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 5 09:28:00 2018 -0500

    Merge prop293 and mark it closed.
---
 dir-spec.txt                           | 11 +++++++++++
 proposals/000-index.txt                |  4 ++--
 proposals/293-know-when-to-publish.txt |  6 +++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index a6547ce..e9f201c 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -358,6 +358,11 @@
 
       - Its uptime has been reset (by restarting).
 
+      - It receives a networkstatus consensus in which it is not listed.
+
+      - It receives a networkstatus consensus in which it is listed
+        with the StaleDesc flag.
+
       [XXX this list is incomplete; see router_differences_are_cosmetic()
        in routerlist.c for others]
 
@@ -2293,6 +2298,8 @@
           "NoEdConsensus" if any Ed25519 key in the router's descriptor or
              microdesriptor does not reflect authority consensus.
           "Stable" if the router is suitable for long-lived circuits.
+          "StaleDesc" if the router should upload a new descriptor because
+             the old one is too old.
           "Running" if the router is currently usable over all its published
              ORPorts. (Authorities ignore IPv6 ORPorts unless configured to
              check IPv6 reachability.) Relays without this flag are omitted
@@ -2576,6 +2583,10 @@
    "NoEdConsensus" -- authorities should not vote on this flag; it is
    produced as part of the consensus for consensus method 22 or later.
 
+   "StaleDesc" -- authorities should vote to assign this flag if the
+   published time on the descriptor is over 18 hours in the past.  (This flag
+   was added in 0.4.0.1-alpha.)
+
    Directory server administrators may label some relays or IPs as
    blacklisted, and elect not to include them in their network-status lists.
 
diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index 51f56e5..7960f95 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -213,7 +213,7 @@ Proposals by number:
 290  Continuously update consensus methods [META]
 291  The move to two guard nodes [NEEDS-REVISION]
 292  Mesh-based vanguards [ACCEPTED]
-293  Other ways for relays to know when to publish [OPEN]
+293  Other ways for relays to know when to publish [CLOSED]
 294  TLS 1.3 Migration [DRAFT]
 295  Using ADL-GCM for relay cryptography (solving the crypto-tagging attack) [OPEN]
 296  Have Directory Authorities expose raw bandwidth list files [OPEN]
@@ -247,7 +247,6 @@ Proposals by status:
    285  Directory documents should be standardized as UTF-8
    287  Reduce circuit lifetime without overloading the network
    289  Authenticating sendme cells to mitigate bandwidth attacks
-   293  Other ways for relays to know when to publish [for 0.3.5]
    295  Using ADL-GCM for relay cryptography (solving the crypto-tagging attack)
    296  Have Directory Authorities expose raw bandwidth list files
    297  Relaxing the protover-based shutdown rules [for 0.3.5.x]
@@ -356,6 +355,7 @@ Proposals by status:
    278  Directory Compression Scheme Negotiation [in 0.3.1.1-alpha]
    283  Move IPv6 ORPorts from microdescriptors to the microdesc consensus [for 0.3.3.x] [in 0.3.3.1-alpha]
    284  Hidden Service v3 Control Port
+   293  Other ways for relays to know when to publish [for 0.3.5] [in 0.4.0.1-alpha]
  SUPERSEDED:
    112  Bring Back Pathlen Coin Weight
    113  Simplifying directory authority administration
diff --git a/proposals/293-know-when-to-publish.txt b/proposals/293-know-when-to-publish.txt
index f2d96e0..c6fd1aa 100644
--- a/proposals/293-know-when-to-publish.txt
+++ b/proposals/293-know-when-to-publish.txt
@@ -2,8 +2,12 @@ Filename: 293-know-when-to-publish.txt
 Title: Other ways for relays to know when to publish
 Author: Nick Mathewson
 Created: 30-May-2018
-Status: Open
+Status: Closed
 Target: 0.3.5
+Implemented-In: 0.4.0.1-alpha
+
+  [IMPLEMENTATION NOTES: Mechanism one is implemented; mechanism two is
+  rejected.]
 
 
 1. Motivation