Mark proposal 275 as closed and fold it into dir-spec.

5 files changed, 17 insertions, 9 deletions

diff --git a/dir-spec.txt b/dir-spec.txt
index 543e341..1cf3665 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -2288,10 +2288,11 @@ Table of Contents
         signed (that is, not including the signature) by the RSA identity
         key (see section 1.3.), encoded in base64.
 
-        "Publication" is the publication time of its most recent descriptor,
-        in the form YYYY-MM-DD HH:MM:SS, in UTC.  Implementations MAY base
-        decisions on publication times in the past, but MUST NOT reject
-        publication times in the future.
+        "Publication" was once the publication time of the router's most
+        recent descriptor, in the form YYYY-MM-DD HH:MM:SS, in UTC.  Now
+        it is only used in votes, and may be set to a fixed value in
+        consensus documents.  Implementations SHOULD ignore this value
+        in non-vote documents.
 
         "IP" is its current IP address; ORPort is its current OR port,
         "DirPort" is its current directory port, or "0" for "none".
@@ -2957,6 +2958,10 @@ Table of Contents
           "bwweightscale" and "maxunmeasuredbw" parameters correctly when
           computing votes.
 
+        * If consensus method 33 or later is used, and the consensus
+          flavor is "microdesc", then the "Publication" field in the "r"
+          line is set to "2038-01-01 00:00:00".
+
      The signatures at the end of a consensus document are sorted in
      ascending order by identity digest.
 
diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index a8de698..41bf901 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -195,7 +195,7 @@ Proposals by number:
 272  Listed routers should be Valid, Running, and treated as such [CLOSED]
 273  Exit relay pinning for web services [DRAFT]
 274  Rotate onion keys less frequently [CLOSED]
-275  Stop including meaningful "published" time in microdescriptor consensus [ACCEPTED]
+275  Stop including meaningful "published" time in microdescriptor consensus [CLOSED]
 276  Report bandwidth with lower granularity in consensus documents [DEAD]
 277  Detect multiple relay instances running with same ID [OPEN]
 278  Directory Compression Scheme Negotiation [CLOSED]
@@ -307,7 +307,6 @@ Proposals by status:
    337  A simpler way to decide, "Is this guard usable?"
  ACCEPTED:
    265  Load Balancing with Overhead Parameters [for 0.2.9.x]
-   275  Stop including meaningful "published" time in microdescriptor consensus [for 0.3.1.x-alpha]
    285  Directory documents should be standardized as UTF-8
    288  Privacy-Preserving Statistics with Privcount in Tor (Shamir version)
    292  Mesh-based vanguards
@@ -413,6 +412,7 @@ Proposals by status:
    271  Another algorithm for guard selection [in 0.3.0.1-alpha]
    272  Listed routers should be Valid, Running, and treated as such [in 0.2.9.3-alpha, 0.2.9.4-alpha]
    274  Rotate onion keys less frequently [in 0.3.1.1-alpha]
+   275  Stop including meaningful "published" time in microdescriptor consensus [for 0.3.1.x-alpha] [in 0.4.7.3-alpha]
    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
diff --git a/proposals/275-md-published-time-is-silly.txt b/proposals/275-md-published-time-is-silly.txt
index 355782b..12a762d 100644
--- a/proposals/275-md-published-time-is-silly.txt
+++ b/proposals/275-md-published-time-is-silly.txt
@@ -2,14 +2,17 @@ Filename: 275-md-published-time-is-silly.txt
 Title: Stop including meaningful "published" time in microdescriptor consensus
 Author: Nick Mathewson
 Created: 20-Feb-2017
-Status: Accepted
+Status: Closed
 Target: 0.3.1.x-alpha
+Implemented-In: 0.4.7.3-alpha
 
 0. Status:
 
    As of 0.2.9.11 / 0.3.0.7 / 0.3.1.1-alpha, Tor no longer takes any
    special action on "future" published times, as proposed in section 4.
 
+   As of 0.4.0.1-alpha, we implemented a better mechanism for relays to know
+   when to publish. (See proposal 293.)
 
 1. Overview
 
diff --git a/proposals/BY_INDEX.md b/proposals/BY_INDEX.md
index da9dbef..37a118a 100644
--- a/proposals/BY_INDEX.md
+++ b/proposals/BY_INDEX.md
@@ -192,7 +192,7 @@ Below are a list of proposals sorted by their proposal number.  See
 * [`272-valid-and-running-by-default.txt`](/proposals/272-valid-and-running-by-default.txt): Listed routers should be Valid, Running, and treated as such [CLOSED]
 * [`273-exit-relay-pinning.txt`](/proposals/273-exit-relay-pinning.txt): Exit relay pinning for web services [DRAFT]
 * [`274-rotate-onion-keys-less.txt`](/proposals/274-rotate-onion-keys-less.txt): Rotate onion keys less frequently [CLOSED]
-* [`275-md-published-time-is-silly.txt`](/proposals/275-md-published-time-is-silly.txt): Stop including meaningful "published" time in microdescriptor consensus [ACCEPTED]
+* [`275-md-published-time-is-silly.txt`](/proposals/275-md-published-time-is-silly.txt): Stop including meaningful "published" time in microdescriptor consensus [CLOSED]
 * [`276-lower-bw-granularity.txt`](/proposals/276-lower-bw-granularity.txt): Report bandwidth with lower granularity in consensus documents [DEAD]
 * [`277-detect-id-sharing.txt`](/proposals/277-detect-id-sharing.txt): Detect multiple relay instances running with same ID [OPEN]
 * [`278-directory-compression-scheme-negotiation.txt`](/proposals/278-directory-compression-scheme-negotiation.txt): Directory Compression Scheme Negotiation [CLOSED]
diff --git a/proposals/README.md b/proposals/README.md
index 75f5c4c..95b660c 100644
--- a/proposals/README.md
+++ b/proposals/README.md
@@ -54,7 +54,6 @@ might or might not have a specific timeframe planned for their
 implementation.
 
 * [`265-load-balancing-with-overhead.txt`](/proposals/265-load-balancing-with-overhead.txt): Load Balancing with Overhead Parameters
-* [`275-md-published-time-is-silly.txt`](/proposals/275-md-published-time-is-silly.txt): Stop including meaningful "published" time in microdescriptor consensus
 * [`285-utf-8.txt`](/proposals/285-utf-8.txt): Directory documents should be standardized as UTF-8
 * [`288-privcount-with-shamir.txt`](/proposals/288-privcount-with-shamir.txt): Privacy-Preserving Statistics with Privcount in Tor (Shamir version)
 * [`292-mesh-vanguards.txt`](/proposals/292-mesh-vanguards.txt): Mesh-based vanguards
@@ -231,6 +230,7 @@ necessary.
 * [`271-another-guard-selection.txt`](/proposals/271-another-guard-selection.txt): Another algorithm for guard selection
 * [`272-valid-and-running-by-default.txt`](/proposals/272-valid-and-running-by-default.txt): Listed routers should be Valid, Running, and treated as such
 * [`274-rotate-onion-keys-less.txt`](/proposals/274-rotate-onion-keys-less.txt): Rotate onion keys less frequently
+* [`275-md-published-time-is-silly.txt`](/proposals/275-md-published-time-is-silly.txt): Stop including meaningful "published" time in microdescriptor consensus
 * [`278-directory-compression-scheme-negotiation.txt`](/proposals/278-directory-compression-scheme-negotiation.txt): Directory Compression Scheme Negotiation
 * [`283-ipv6-in-micro-consensus.txt`](/proposals/283-ipv6-in-micro-consensus.txt): Move IPv6 ORPorts from microdescriptors to the microdesc consensus
 * [`284-hsv3-control-port.txt`](/proposals/284-hsv3-control-port.txt): Hidden Service v3 Control Port