Merge branch 'close_prop301' into 'main'

Close prop-301, describing the new consensus method 34 in dir-spec

See merge request tpo/core/torspec!160

4 files changed, 5 insertions, 5 deletions

diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index e740d40..48765d0 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -221,7 +221,7 @@ Proposals by number:
 298  Putting family lines in canonical form [CLOSED]
 299  Preferring IPv4 or IPv6 based on IP Version Failure Count [SUPERSEDED]
 300  Walking Onions: Scaling and Saving Bandwidth [INFORMATIONAL]
-301  Don't include package fingerprints in consensus documents [ACCEPTED]
+301  Don't include package fingerprints in consensus documents [CLOSED]
 302  Hiding onion service clients using padding [CLOSED]
 303  When and how to remove support for protocol versions [OPEN]
 304  Extending SOCKS5 Onion Service Error Codes [CLOSED]
@@ -307,7 +307,6 @@ Proposals by status:
    282  Remove "Named" and "Unnamed" handling from consensus voting [for arti-dirauth]
    285  Directory documents should be standardized as UTF-8 [for arti-dirauth]
    292  Mesh-based vanguards
-   301  Don't include package fingerprints in consensus documents
    311  Tor Relay IPv6 Reachability
    312  Tor Relay Automatic IPv6 Address Discovery
    313  Tor Relay IPv6 Statistics
@@ -421,6 +420,7 @@ Proposals by status:
    296  Have Directory Authorities expose raw bandwidth list files [in 0.4.0.1-alpha]
    297  Relaxing the protover-based shutdown rules [for 0.3.5.x] [in 0.4.0.x]
    298  Putting family lines in canonical form [for 0.3.6.x] [in 0.4.0.1-alpha]
+   301  Don't include package fingerprints in consensus documents
    302  Hiding onion service clients using padding [in 0.4.1.1-alpha]
    304  Extending SOCKS5 Onion Service Error Codes
    305  ESTABLISH_INTRO Cell DoS Defense Extension
diff --git a/proposals/301-dont-vote-on-package-fingerprints.txt b/proposals/301-dont-vote-on-package-fingerprints.txt
index 125df86..cabf4f7 100644
--- a/proposals/301-dont-vote-on-package-fingerprints.txt
+++ b/proposals/301-dont-vote-on-package-fingerprints.txt
@@ -2,7 +2,7 @@ Filename: 301-dont-vote-on-package-fingerprints.txt
 Title: Don't include package fingerprints in consensus documents
 Author: Iain R. Learmonth
 Created: 2019-02-21
-Status: Accepted
+Status: Closed
 Ticket: #28465
 
 0. Abstract
diff --git a/proposals/BY_INDEX.md b/proposals/BY_INDEX.md
index 0957f89..50884b5 100644
--- a/proposals/BY_INDEX.md
+++ b/proposals/BY_INDEX.md
@@ -218,7 +218,7 @@ Below are a list of proposals sorted by their proposal number.  See
 * [`298-canonical-families.txt`](/proposals/298-canonical-families.txt): Putting family lines in canonical form [CLOSED]
 * [`299-ip-failure-count.txt`](/proposals/299-ip-failure-count.txt): Preferring IPv4 or IPv6 based on IP Version Failure Count [SUPERSEDED]
 * [`300-walking-onions.txt`](/proposals/300-walking-onions.txt): Walking Onions: Scaling and Saving Bandwidth [INFORMATIONAL]
-* [`301-dont-vote-on-package-fingerprints.txt`](/proposals/301-dont-vote-on-package-fingerprints.txt): Don't include package fingerprints in consensus documents [ACCEPTED]
+* [`301-dont-vote-on-package-fingerprints.txt`](/proposals/301-dont-vote-on-package-fingerprints.txt): Don't include package fingerprints in consensus documents [CLOSED]
 * [`302-padding-machines-for-onion-clients.txt`](/proposals/302-padding-machines-for-onion-clients.txt): Hiding onion service clients using padding [CLOSED]
 * [`303-protover-removal-policy.txt`](/proposals/303-protover-removal-policy.txt): When and how to remove support for protocol versions [OPEN]
 * [`304-socks5-extending-hs-error-codes.txt`](/proposals/304-socks5-extending-hs-error-codes.txt): Extending SOCKS5 Onion Service Error Codes [CLOSED]
diff --git a/proposals/README.md b/proposals/README.md
index 13ef08d..3c7f8fc 100644
--- a/proposals/README.md
+++ b/proposals/README.md
@@ -50,7 +50,6 @@ implementation.
 * [`282-remove-named-from-consensus.txt`](/proposals/282-remove-named-from-consensus.txt): Remove "Named" and "Unnamed" handling from consensus voting
 * [`285-utf-8.txt`](/proposals/285-utf-8.txt): Directory documents should be standardized as UTF-8
 * [`292-mesh-vanguards.txt`](/proposals/292-mesh-vanguards.txt): Mesh-based vanguards
-* [`301-dont-vote-on-package-fingerprints.txt`](/proposals/301-dont-vote-on-package-fingerprints.txt): Don't include package fingerprints in consensus documents
 * [`311-relay-ipv6-reachability.txt`](/proposals/311-relay-ipv6-reachability.txt): Tor Relay IPv6 Reachability
 * [`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
@@ -231,6 +230,7 @@ necessary.
 * [`296-expose-bandwidth-files.txt`](/proposals/296-expose-bandwidth-files.txt): Have Directory Authorities expose raw bandwidth list files
 * [`297-safer-protover-shutdowns.txt`](/proposals/297-safer-protover-shutdowns.txt): Relaxing the protover-based shutdown rules
 * [`298-canonical-families.txt`](/proposals/298-canonical-families.txt): Putting family lines in canonical form
+* [`301-dont-vote-on-package-fingerprints.txt`](/proposals/301-dont-vote-on-package-fingerprints.txt): Don't include package fingerprints in consensus documents
 * [`302-padding-machines-for-onion-clients.txt`](/proposals/302-padding-machines-for-onion-clients.txt): Hiding onion service clients using padding
 * [`304-socks5-extending-hs-error-codes.txt`](/proposals/304-socks5-extending-hs-error-codes.txt): Extending SOCKS5 Onion Service Error Codes
 * [`305-establish-intro-dos-defense-extention.txt`](/proposals/305-establish-intro-dos-defense-extention.txt): ESTABLISH_INTRO Cell DoS Defense Extension