Merge branch 'accept_prop301' into 'main'

Mark proposal 301 (don't vote on package fingerprints) as accepted.

See merge request tpo/core/torspec!159

4 files changed, 5 insertions, 5 deletions

diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index ab19573..874fe2b 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 [OPEN]
+301  Don't include package fingerprints in consensus documents [ACCEPTED]
 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]
@@ -291,7 +291,6 @@ Proposals by status:
    277  Detect multiple relay instances running with same ID [for 0.3.??]
    287  Reduce circuit lifetime without overloading the network
    295  Using ADL for relay cryptography (solving the crypto-tagging attack)
-   301  Don't include package fingerprints in consensus documents
    303  When and how to remove support for protocol versions
    306  A Tor Implementation of IPv6 Happy Eyeballs
    309  Optimistic SOCKS Data
@@ -308,6 +307,7 @@ Proposals by status:
    282  Remove "Named" and "Unnamed" handling from consensus voting [for 0.3.3.x]
    285  Directory documents should be standardized as UTF-8
    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
diff --git a/proposals/301-dont-vote-on-package-fingerprints.txt b/proposals/301-dont-vote-on-package-fingerprints.txt
index 8e8b63a..125df86 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: Open
+Status: Accepted
 Ticket: #28465
 
 0. Abstract
diff --git a/proposals/BY_INDEX.md b/proposals/BY_INDEX.md
index 889f10b..5aa9400 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 [OPEN]
+* [`301-dont-vote-on-package-fingerprints.txt`](/proposals/301-dont-vote-on-package-fingerprints.txt): Don't include package fingerprints in consensus documents [ACCEPTED]
 * [`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 a65290f..1bb2c1d 100644
--- a/proposals/README.md
+++ b/proposals/README.md
@@ -26,7 +26,6 @@ for discussion.
 * [`277-detect-id-sharing.txt`](/proposals/277-detect-id-sharing.txt): Detect multiple relay instances running with same ID
 * [`287-reduce-lifetime.txt`](/proposals/287-reduce-lifetime.txt): Reduce circuit lifetime without overloading the network
 * [`295-relay-crypto-with-adl.txt`](/proposals/295-relay-crypto-with-adl.txt): Using ADL for relay cryptography (solving the crypto-tagging attack)
-* [`301-dont-vote-on-package-fingerprints.txt`](/proposals/301-dont-vote-on-package-fingerprints.txt): Don't include package fingerprints in consensus documents
 * [`303-protover-removal-policy.txt`](/proposals/303-protover-removal-policy.txt): When and how to remove support for protocol versions
 * [`306-ipv6-happy-eyeballs.txt`](/proposals/306-ipv6-happy-eyeballs.txt): A Tor Implementation of IPv6 Happy Eyeballs
 * [`309-optimistic-socks-in-tor.txt`](/proposals/309-optimistic-socks-in-tor.txt): Optimistic SOCKS Data
@@ -50,6 +49,7 @@ 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