Update proposal indices

3 files changed, 84 insertions, 84 deletions

diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index 5ccd865..fa20d5e 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -108,7 +108,7 @@ Proposals by number:
 185  Directory caches without DirPort [SUPERSEDED]
 186  Multiple addresses for one OR or bridge [CLOSED]
 187  Reserve a cell type to allow client authorization [CLOSED]
-188  Bridge Guards and other anti-enumeration defenses [ACCEPTED]
+188  Bridge Guards and other anti-enumeration defenses [RESERVE]
 189  AUTHORIZE and AUTHORIZED cells [OBSOLETE]
 190  Bridge Client Authorization Based on a Shared Secret [OBSOLETE]
 191  Bridge Detection Resistance against MITM-capable Adversaries [OBSOLETE]
@@ -160,7 +160,7 @@ Proposals by number:
 237  All relays are directory servers [CLOSED]
 238  Better hidden service stats from Tor relays [CLOSED]
 239  Consensus Hash Chaining [OPEN]
-240  Early signing key revocation for directory authorities [DRAFT]
+240  Early signing key revocation for directory authorities [OPEN]
 241  Resisting guard-turnover attacks [REJECTED]
 242  Better performance and usability for the MyFamily option [RESERVE]
 243  Give out HSDir flag only to relays with Stable flag [CLOSED]
@@ -174,7 +174,7 @@ Proposals by number:
 251  Padding for netflow record resolution reduction [CLOSED]
 252  Single Onion Services [SUPERSEDED]
 253  Out of Band Circuit HMACs [DEAD]
-254  Padding Negotiation [NEEDS-REVISION]
+254  Padding Negotiation [CLOSED]
 255  Controller features to allow for load-balancing hidden services [RESERVE]
 256  Key revocation for relays and authorities [RESERVE]
 257  Refactoring authorities and making them more isolated from the net [META]
@@ -182,7 +182,7 @@ Proposals by number:
 259  New Guard Selection Behaviour [OBSOLETE]
 260  Rendezvous Single Onion Services [FINISHED]
 261  AEZ for relay cryptography [OBSOLETE]
-262  Re-keying live circuits with new cryptographic material [OPEN]
+262  Re-keying live circuits with new cryptographic material [RESERVE]
 263  Request to change key exchange protocol for handshake v1.2 [OBSOLETE]
 264  Putting version numbers on the Tor subprotocols [CLOSED]
 265  Load Balancing with Overhead Parameters [ACCEPTED]
@@ -195,17 +195,17 @@ 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 [OPEN]
-276  Report bandwidth with lower granularity in consensus documents [OPEN]
+275  Stop including meaningful "published" time in microdescriptor consensus [ACCEPTED]
+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]
 279  A Name System API for Tor Onion Services [NEEDS-REVISION]
 280  Privacy-Preserving Statistics with Privcount in Tor [SUPERSEDED]
 281  Downloading microdescriptors in bulk [RESERVE]
-282  Remove "Named" and "Unnamed" handling from consensus voting [ACCEPTED]
+282  Remove "Named" and "Unnamed" handling from consensus voting [FINISHED]
 283  Move IPv6 ORPorts from microdescriptors to the microdesc consensus [CLOSED]
 284  Hidden Service v3 Control Port [CLOSED]
-285  Directory documents should be standardized as UTF-8 [OPEN]
+285  Directory documents should be standardized as UTF-8 [ACCEPTED]
 286  Controller APIs for hibernation access on mobile [REJECTED]
 287  Reduce circuit lifetime without overloading the network [OPEN]
 288  Privacy-Preserving Statistics with Privcount in Tor (Shamir version) [ACCEPTED]
@@ -219,26 +219,26 @@ Proposals by number:
 296  Have Directory Authorities expose raw bandwidth list files [OPEN]
 297  Relaxing the protover-based shutdown rules [CLOSED]
 298  Putting family lines in canonical form [CLOSED]
-299  Preferring IPv4 or IPv6 based on IP Version Failure Count [OPEN]
-300  Walking Onions: Scaling and Saving Bandwidth [DRAFT]
-301  Don't include package fingerprints in consensus documents [ACCEPTED]
+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 [FINISHED]
 302  Hiding onion service clients using padding [CLOSED]
-303  When and how to remove support for protocol versions [DRAFT]
+303  When and how to remove support for protocol versions [OPEN]
 304  Extending SOCKS5 Onion Service Error Codes [CLOSED]
 305  ESTABLISH_INTRO Cell DoS Defense Extension [CLOSED]
 306  A Tor Implementation of IPv6 Happy Eyeballs [OPEN]
-307  Onion Balance Support for Onion Service v3 [DRAFT]
-308  Counter Galois Onion: A New Proposal for Forward-Secure Relay Cryptography [DRAFT]
+307  Onion Balance Support for Onion Service v3 [RESERVE]
+308  Counter Galois Onion: A New Proposal for Forward-Secure Relay Cryptography [OPEN]
 309  Optimistic SOCKS Data [DRAFT]
-310  Towards load-balancing in Prop 271 [OPEN]
-311  Tor Relay IPv6 Reachability [DRAFT]
-312  Tor Relay Automatic IPv6 Address Discovery [DRAFT]
-313  Tor Relay IPv6 Statistics [DRAFT]
-314  Allow Markdown for proposal format [ACCEPTED]
+310  Towards load-balancing in Prop 271 [FINISHED]
+311  Tor Relay IPv6 Reachability [ACCEPTED]
+312  Tor Relay Automatic IPv6 Address Discovery [ACCEPTED]
+313  Tor Relay IPv6 Statistics [ACCEPTED]
+314  Allow Markdown for proposal format [FINISHED]
 315  Updating the list of fields required in directory documents [OPEN]
 316  FlashFlow: A Secure Speed Test for Tor (Parent Proposal) [DRAFT]
-317  Improve security aspects of DNS name resolution [OPEN]
-318  Limit protover values to 0-63 [OPEN]
+317  Improve security aspects of DNS name resolution [NEEDS-REVISION]
+318  Limit protover values to 0-63 [ACCEPTED]
 319  RELAY_FRAGMENT cells [OPEN]
 320  Removing TAP usage from v2 onion services [REJECTED]
 321  Better performance and usability for the MyFamily option (v2) [OPEN]
@@ -251,45 +251,32 @@ Proposals by number:
 Proposals by status:
 
  DRAFT:
-   240  Early signing key revocation for directory authorities
    273  Exit relay pinning for web services [for n/a]
    294  TLS 1.3 Migration
-   300  Walking Onions: Scaling and Saving Bandwidth
-   303  When and how to remove support for protocol versions
-   307  Onion Balance Support for Onion Service v3
-   308  Counter Galois Onion: A New Proposal for Forward-Secure Relay Cryptography
    309  Optimistic SOCKS Data
-   311  Tor Relay IPv6 Reachability
-   312  Tor Relay Automatic IPv6 Address Discovery
-   313  Tor Relay IPv6 Statistics
    316  FlashFlow: A Secure Speed Test for Tor (Parent Proposal)
  NEEDS-REVISION:
    212  Increase Acceptable Consensus Age [for 0.2.4.x+]
    219  Support for full DNS and DNSSEC resolution in Tor [for 0.2.5.x]
    245  Deprecating and removing the TAP circuit extension protocol
    248  Remove all RSA identity keys
-   254  Padding Negotiation
    269  Transitionally secure hybrid handshakes
    279  A Name System API for Tor Onion Services
    291  The move to two guard nodes
+   317  Improve security aspects of DNS name resolution
  OPEN:
    201  Make bridges report statistics on daily v3 network status requests [for 0.2.4.x]
    239  Consensus Hash Chaining
-   262  Re-keying live circuits with new cryptographic material
+   240  Early signing key revocation for directory authorities
    267  Tor Consensus Transparency
-   275  Stop including meaningful "published" time in microdescriptor consensus [for 0.3.1.x-alpha]
-   276  Report bandwidth with lower granularity in consensus documents [for 0.3.1.x-alpha]
    277  Detect multiple relay instances running with same ID [for 0.3.??]
-   285  Directory documents should be standardized as UTF-8
    287  Reduce circuit lifetime without overloading the network
    295  Using ADL for relay cryptography (solving the crypto-tagging attack)
    296  Have Directory Authorities expose raw bandwidth list files
-   299  Preferring IPv4 or IPv6 based on IP Version Failure Count
+   303  When and how to remove support for protocol versions
    306  A Tor Implementation of IPv6 Happy Eyeballs
-   310  Towards load-balancing in Prop 271
+   308  Counter Galois Onion: A New Proposal for Forward-Secure Relay Cryptography
    315  Updating the list of fields required in directory documents
-   317  Improve security aspects of DNS name resolution
-   318  Limit protover values to 0-63
    319  RELAY_FRAGMENT cells
    321  Better performance and usability for the MyFamily option (v2)
    322  Extending link specifiers to include the directory port
@@ -297,13 +284,15 @@ Proposals by status:
    324  RTT-based Congestion Control for Tor
    325  Packed relay cells: saving space on small commands
  ACCEPTED:
-   188  Bridge Guards and other anti-enumeration defenses
    265  Load Balancing with Overhead Parameters [for 0.2.9.x]
-   282  Remove "Named" and "Unnamed" handling from consensus voting [for 0.3.3.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
-   301  Don't include package fingerprints in consensus documents
-   314  Allow Markdown for proposal format
+   311  Tor Relay IPv6 Reachability
+   312  Tor Relay Automatic IPv6 Address Discovery
+   313  Tor Relay IPv6 Statistics
+   318  Limit protover values to 0-63
  META:
    000  Index of Tor Proposals
    001  The Tor Proposal Process
@@ -318,6 +307,10 @@ Proposals by status:
    217  Tor Extended ORPort Authentication [for 0.2.5.x]
    232  Pluggable Transport through SOCKS proxy [in 0.2.6]
    260  Rendezvous Single Onion Services [in 0.2.9.3-alpha]
+   282  Remove "Named" and "Unnamed" handling from consensus voting [for 0.3.3.x]
+   301  Don't include package fingerprints in consensus documents
+   310  Towards load-balancing in Prop 271
+   314  Allow Markdown for proposal format
  CLOSED:
    101  Voting on the Tor Directory System [in 0.2.0.x]
    102  Dropping "opt" from the directory format [in 0.2.0.x]
@@ -394,6 +387,7 @@ Proposals by status:
    244  Use RFC5705 Key Exporting in our AUTHENTICATE calls [in 0.3.0.1-alpha]
    250  Random Number Generation During Tor Voting
    251  Padding for netflow record resolution reduction [in 0.3.1.1-alpha]
+   254  Padding Negotiation
    264  Putting version numbers on the Tor subprotocols [in 0.2.9.4-alpha]
    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]
@@ -432,6 +426,7 @@ Proposals by status:
    252  Single Onion Services
    266  Removing current obsolete clients from the Tor network
    280  Privacy-Preserving Statistics with Privcount in Tor
+   299  Preferring IPv4 or IPv6 based on IP Version Failure Count
  DEAD:
    100  Tor Unreliable Datagram Extension Proposal
    115  Two Hop Paths
@@ -443,6 +438,7 @@ Proposals by status:
    213  Remove stream-level sendmes from the design
    253  Out of Band Circuit HMACs
    258  Denial-of-service resistance for directory authorities
+   276  Report bandwidth with lower granularity in consensus documents
  REJECTED:
    134  More robust consensus voting with diverse authority sets
    147  Eliminate the need for v2 directories in generating v3 directories [for 0.2.4.x]
@@ -484,12 +480,16 @@ Proposals by status:
    133  Incorporate Unreachable ORs into the Tor Network
    172  GETINFO controller option for circuit information
    177  Abstaining from votes on individual flags [for 0.2.4.x]
+   188  Bridge Guards and other anti-enumeration defenses
    211  Internal Mapaddress for Tor Configuration Testing [for 0.2.4.x+]
    223  Ace: Improved circuit-creation key exchange
    226  "Scalability and Stability Improvements to BridgeDB: Switching to a Distributed Database System and RDBMS"
    242  Better performance and usability for the MyFamily option
    255  Controller features to allow for load-balancing hidden services
    256  Key revocation for relays and authorities
+   262  Re-keying live circuits with new cryptographic material
    281  Downloading microdescriptors in bulk
+   307  Onion Balance Support for Onion Service v3
  INFORMATIONAL:
    159  Exit Scanning
+   300  Walking Onions: Scaling and Saving Bandwidth
diff --git a/proposals/BY_INDEX.md b/proposals/BY_INDEX.md
index 45fc3ff..b5a6a4f 100644
--- a/proposals/BY_INDEX.md
+++ b/proposals/BY_INDEX.md
@@ -105,7 +105,7 @@ Below are a list of proposals sorted by their proposal number.  See
 * [`185-dir-without-dirport.txt`](/proposals/185-dir-without-dirport.txt): Directory caches without DirPort [SUPERSEDED]
 * [`186-multiple-orports.txt`](/proposals/186-multiple-orports.txt): Multiple addresses for one OR or bridge [CLOSED]
 * [`187-allow-client-auth.txt`](/proposals/187-allow-client-auth.txt): Reserve a cell type to allow client authorization [CLOSED]
-* [`188-bridge-guards.txt`](/proposals/188-bridge-guards.txt): Bridge Guards and other anti-enumeration defenses [ACCEPTED]
+* [`188-bridge-guards.txt`](/proposals/188-bridge-guards.txt): Bridge Guards and other anti-enumeration defenses [RESERVE]
 * [`189-authorize-cell.txt`](/proposals/189-authorize-cell.txt): AUTHORIZE and AUTHORIZED cells [OBSOLETE]
 * [`190-shared-secret-bridge-authorization.txt`](/proposals/190-shared-secret-bridge-authorization.txt): Bridge Client Authorization Based on a Shared Secret [OBSOLETE]
 * [`191-mitm-bridge-detection-resistance.txt`](/proposals/191-mitm-bridge-detection-resistance.txt): Bridge Detection Resistance against MITM-capable Adversaries [OBSOLETE]
@@ -157,7 +157,7 @@ Below are a list of proposals sorted by their proposal number.  See
 * [`237-directory-servers-for-all.txt`](/proposals/237-directory-servers-for-all.txt): All relays are directory servers [CLOSED]
 * [`238-hs-relay-stats.txt`](/proposals/238-hs-relay-stats.txt): Better hidden service stats from Tor relays [CLOSED]
 * [`239-consensus-hash-chaining.txt`](/proposals/239-consensus-hash-chaining.txt): Consensus Hash Chaining [OPEN]
-* [`240-auth-cert-revocation.txt`](/proposals/240-auth-cert-revocation.txt): Early signing key revocation for directory authorities [DRAFT]
+* [`240-auth-cert-revocation.txt`](/proposals/240-auth-cert-revocation.txt): Early signing key revocation for directory authorities [OPEN]
 * [`241-suspicious-guard-turnover.txt`](/proposals/241-suspicious-guard-turnover.txt): Resisting guard-turnover attacks [REJECTED]
 * [`242-better-families.txt`](/proposals/242-better-families.txt): Better performance and usability for the MyFamily option [RESERVE]
 * [`243-hsdir-flag-need-stable.txt`](/proposals/243-hsdir-flag-need-stable.txt): Give out HSDir flag only to relays with Stable flag [CLOSED]
@@ -171,7 +171,7 @@ Below are a list of proposals sorted by their proposal number.  See
 * [`251-netflow-padding.txt`](/proposals/251-netflow-padding.txt): Padding for netflow record resolution reduction [CLOSED]
 * [`252-single-onion.txt`](/proposals/252-single-onion.txt): Single Onion Services [SUPERSEDED]
 * [`253-oob-hmac.txt`](/proposals/253-oob-hmac.txt): Out of Band Circuit HMACs [DEAD]
-* [`254-padding-negotiation.txt`](/proposals/254-padding-negotiation.txt): Padding Negotiation [NEEDS-REVISION]
+* [`254-padding-negotiation.txt`](/proposals/254-padding-negotiation.txt): Padding Negotiation [CLOSED]
 * [`255-hs-load-balancing.txt`](/proposals/255-hs-load-balancing.txt): Controller features to allow for load-balancing hidden services [RESERVE]
 * [`256-key-revocation.txt`](/proposals/256-key-revocation.txt): Key revocation for relays and authorities [RESERVE]
 * [`257-hiding-authorities.txt`](/proposals/257-hiding-authorities.txt): Refactoring authorities and making them more isolated from the net [META]
@@ -179,7 +179,7 @@ Below are a list of proposals sorted by their proposal number.  See
 * [`259-guard-selection.txt`](/proposals/259-guard-selection.txt): New Guard Selection Behaviour [OBSOLETE]
 * [`260-rend-single-onion.txt`](/proposals/260-rend-single-onion.txt): Rendezvous Single Onion Services [FINISHED]
 * [`261-aez-crypto.txt`](/proposals/261-aez-crypto.txt): AEZ for relay cryptography [OBSOLETE]
-* [`262-rekey-circuits.txt`](/proposals/262-rekey-circuits.txt): Re-keying live circuits with new cryptographic material [OPEN]
+* [`262-rekey-circuits.txt`](/proposals/262-rekey-circuits.txt): Re-keying live circuits with new cryptographic material [RESERVE]
 * [`263-ntru-for-pq-handshake.txt`](/proposals/263-ntru-for-pq-handshake.txt): Request to change key exchange protocol for handshake v1.2 [OBSOLETE]
 * [`264-subprotocol-versions.txt`](/proposals/264-subprotocol-versions.txt): Putting version numbers on the Tor subprotocols [CLOSED]
 * [`265-load-balancing-with-overhead.txt`](/proposals/265-load-balancing-with-overhead.txt): Load Balancing with Overhead Parameters [ACCEPTED]
@@ -192,17 +192,17 @@ 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 [OPEN]
-* [`276-lower-bw-granularity.txt`](/proposals/276-lower-bw-granularity.txt): Report bandwidth with lower granularity in consensus documents [OPEN]
+* [`275-md-published-time-is-silly.txt`](/proposals/275-md-published-time-is-silly.txt): Stop including meaningful "published" time in microdescriptor consensus [ACCEPTED]
+* [`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]
 * [`279-naming-layer-api.txt`](/proposals/279-naming-layer-api.txt): A Name System API for Tor Onion Services [NEEDS-REVISION]
 * [`280-privcount-in-tor.txt`](/proposals/280-privcount-in-tor.txt): Privacy-Preserving Statistics with Privcount in Tor [SUPERSEDED]
 * [`281-bulk-md-download.txt`](/proposals/281-bulk-md-download.txt): Downloading microdescriptors in bulk [RESERVE]
-* [`282-remove-named-from-consensus.txt`](/proposals/282-remove-named-from-consensus.txt): Remove "Named" and "Unnamed" handling from consensus voting [ACCEPTED]
+* [`282-remove-named-from-consensus.txt`](/proposals/282-remove-named-from-consensus.txt): Remove "Named" and "Unnamed" handling from consensus voting [FINISHED]
 * [`283-ipv6-in-micro-consensus.txt`](/proposals/283-ipv6-in-micro-consensus.txt): Move IPv6 ORPorts from microdescriptors to the microdesc consensus [CLOSED]
 * [`284-hsv3-control-port.txt`](/proposals/284-hsv3-control-port.txt): Hidden Service v3 Control Port [CLOSED]
-* [`285-utf-8.txt`](/proposals/285-utf-8.txt): Directory documents should be standardized as UTF-8 [OPEN]
+* [`285-utf-8.txt`](/proposals/285-utf-8.txt): Directory documents should be standardized as UTF-8 [ACCEPTED]
 * [`286-hibernation-api.txt`](/proposals/286-hibernation-api.txt): Controller APIs for hibernation access on mobile [REJECTED]
 * [`287-reduce-lifetime.txt`](/proposals/287-reduce-lifetime.txt): Reduce circuit lifetime without overloading the network [OPEN]
 * [`288-privcount-with-shamir.txt`](/proposals/288-privcount-with-shamir.txt): Privacy-Preserving Statistics with Privcount in Tor (Shamir version) [ACCEPTED]
@@ -216,26 +216,26 @@ Below are a list of proposals sorted by their proposal number.  See
 * [`296-expose-bandwidth-files.txt`](/proposals/296-expose-bandwidth-files.txt): Have Directory Authorities expose raw bandwidth list files [OPEN]
 * [`297-safer-protover-shutdowns.txt`](/proposals/297-safer-protover-shutdowns.txt): Relaxing the protover-based shutdown rules [CLOSED]
 * [`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 [OPEN]
-* [`300-walking-onions.txt`](/proposals/300-walking-onions.txt): Walking Onions: Scaling and Saving Bandwidth [DRAFT]
-* [`301-dont-vote-on-package-fingerprints.txt`](/proposals/301-dont-vote-on-package-fingerprints.txt): Don't include package fingerprints in consensus documents [ACCEPTED]
+* [`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 [FINISHED]
 * [`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 [DRAFT]
+* [`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]
 * [`305-establish-intro-dos-defense-extention.txt`](/proposals/305-establish-intro-dos-defense-extention.txt): ESTABLISH_INTRO Cell DoS Defense Extension [CLOSED]
 * [`306-ipv6-happy-eyeballs.txt`](/proposals/306-ipv6-happy-eyeballs.txt): A Tor Implementation of IPv6 Happy Eyeballs [OPEN]
-* [`307-onionbalance-v3.txt`](/proposals/307-onionbalance-v3.txt): Onion Balance Support for Onion Service v3 [DRAFT]
-* [`308-counter-galois-onion.txt`](/proposals/308-counter-galois-onion.txt): Counter Galois Onion: A New Proposal for Forward-Secure Relay Cryptography [DRAFT]
+* [`307-onionbalance-v3.txt`](/proposals/307-onionbalance-v3.txt): Onion Balance Support for Onion Service v3 [RESERVE]
+* [`308-counter-galois-onion.txt`](/proposals/308-counter-galois-onion.txt): Counter Galois Onion: A New Proposal for Forward-Secure Relay Cryptography [OPEN]
 * [`309-optimistic-socks-in-tor.txt`](/proposals/309-optimistic-socks-in-tor.txt): Optimistic SOCKS Data [DRAFT]
-* [`310-bandaid-on-guard-selection.txt`](/proposals/310-bandaid-on-guard-selection.txt): Towards load-balancing in Prop 271 [OPEN]
-* [`311-relay-ipv6-reachability.txt`](/proposals/311-relay-ipv6-reachability.txt): Tor Relay IPv6 Reachability [DRAFT]
-* [`312-relay-auto-ipv6-addr.txt`](/proposals/312-relay-auto-ipv6-addr.txt): Tor Relay Automatic IPv6 Address Discovery [DRAFT]
-* [`313-relay-ipv6-stats.txt`](/proposals/313-relay-ipv6-stats.txt): Tor Relay IPv6 Statistics [DRAFT]
-* [`314-allow-markdown-proposals.md`](/proposals/314-allow-markdown-proposals.md): Allow Markdown for proposal format [ACCEPTED]
+* [`310-bandaid-on-guard-selection.txt`](/proposals/310-bandaid-on-guard-selection.txt): Towards load-balancing in Prop 271 [FINISHED]
+* [`311-relay-ipv6-reachability.txt`](/proposals/311-relay-ipv6-reachability.txt): Tor Relay IPv6 Reachability [ACCEPTED]
+* [`312-relay-auto-ipv6-addr.txt`](/proposals/312-relay-auto-ipv6-addr.txt): Tor Relay Automatic IPv6 Address Discovery [ACCEPTED]
+* [`313-relay-ipv6-stats.txt`](/proposals/313-relay-ipv6-stats.txt): Tor Relay IPv6 Statistics [ACCEPTED]
+* [`314-allow-markdown-proposals.md`](/proposals/314-allow-markdown-proposals.md): Allow Markdown for proposal format [FINISHED]
 * [`315-update-dir-required-fields.txt`](/proposals/315-update-dir-required-fields.txt): Updating the list of fields required in directory documents [OPEN]
 * [`316-flashflow.txt`](/proposals/316-flashflow.txt): FlashFlow: A Secure Speed Test for Tor (Parent Proposal) [DRAFT]
-* [`317-secure-dns-name-resolution.txt`](/proposals/317-secure-dns-name-resolution.txt): Improve security aspects of DNS name resolution [OPEN]
-* [`318-limit-protovers.md`](/proposals/318-limit-protovers.md): Limit protover values to 0-63 [OPEN]
+* [`317-secure-dns-name-resolution.txt`](/proposals/317-secure-dns-name-resolution.txt): Improve security aspects of DNS name resolution [NEEDS-REVISION]
+* [`318-limit-protovers.md`](/proposals/318-limit-protovers.md): Limit protover values to 0-63 [ACCEPTED]
 * [`319-wide-everything.md`](/proposals/319-wide-everything.md): RELAY_FRAGMENT cells [OPEN]
 * [`320-tap-out-again.md`](/proposals/320-tap-out-again.md): Removing TAP usage from v2 onion services [REJECTED]
 * [`321-happy-families.md`](/proposals/321-happy-families.md): Better performance and usability for the MyFamily option (v2) [OPEN]
diff --git a/proposals/README.md b/proposals/README.md
index 4ad227d..f1b4ea4 100644
--- a/proposals/README.md
+++ b/proposals/README.md
@@ -22,21 +22,16 @@ for discussion.
 
 * [`201-bridge-v3-reqs-stats.txt`](/proposals/201-bridge-v3-reqs-stats.txt): Make bridges report statistics on daily v3 network status requests
 * [`239-consensus-hash-chaining.txt`](/proposals/239-consensus-hash-chaining.txt): Consensus Hash Chaining
-* [`262-rekey-circuits.txt`](/proposals/262-rekey-circuits.txt): Re-keying live circuits with new cryptographic material
+* [`240-auth-cert-revocation.txt`](/proposals/240-auth-cert-revocation.txt): Early signing key revocation for directory authorities
 * [`267-tor-consensus-transparency.txt`](/proposals/267-tor-consensus-transparency.txt): Tor Consensus Transparency
-* [`275-md-published-time-is-silly.txt`](/proposals/275-md-published-time-is-silly.txt): Stop including meaningful "published" time in microdescriptor consensus
-* [`276-lower-bw-granularity.txt`](/proposals/276-lower-bw-granularity.txt): Report bandwidth with lower granularity in consensus documents
 * [`277-detect-id-sharing.txt`](/proposals/277-detect-id-sharing.txt): Detect multiple relay instances running with same ID
-* [`285-utf-8.txt`](/proposals/285-utf-8.txt): Directory documents should be standardized as UTF-8
 * [`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)
 * [`296-expose-bandwidth-files.txt`](/proposals/296-expose-bandwidth-files.txt): Have Directory Authorities expose raw bandwidth list files
-* [`299-ip-failure-count.txt`](/proposals/299-ip-failure-count.txt): Preferring IPv4 or IPv6 based on IP Version Failure Count
+* [`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
-* [`310-bandaid-on-guard-selection.txt`](/proposals/310-bandaid-on-guard-selection.txt): Towards load-balancing in Prop 271
+* [`308-counter-galois-onion.txt`](/proposals/308-counter-galois-onion.txt): Counter Galois Onion: A New Proposal for Forward-Secure Relay Cryptography
 * [`315-update-dir-required-fields.txt`](/proposals/315-update-dir-required-fields.txt): Updating the list of fields required in directory documents
-* [`317-secure-dns-name-resolution.txt`](/proposals/317-secure-dns-name-resolution.txt): Improve security aspects of DNS name resolution
-* [`318-limit-protovers.md`](/proposals/318-limit-protovers.md): Limit protover values to 0-63
 * [`319-wide-everything.md`](/proposals/319-wide-everything.md): RELAY_FRAGMENT cells
 * [`321-happy-families.md`](/proposals/321-happy-families.md): Better performance and usability for the MyFamily option (v2)
 * [`322-dirport-linkspec.md`](/proposals/322-dirport-linkspec.md): Extending link specifiers to include the directory port
@@ -51,13 +46,15 @@ These are the proposals that we agree we'd like to implement.  They
 might or might not have a specific timeframe planned for their
 implementation.
 
-* [`188-bridge-guards.txt`](/proposals/188-bridge-guards.txt): Bridge Guards and other anti-enumeration defenses
 * [`265-load-balancing-with-overhead.txt`](/proposals/265-load-balancing-with-overhead.txt): Load Balancing with Overhead Parameters
-* [`282-remove-named-from-consensus.txt`](/proposals/282-remove-named-from-consensus.txt): Remove "Named" and "Unnamed" handling from consensus voting
+* [`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
-* [`301-dont-vote-on-package-fingerprints.txt`](/proposals/301-dont-vote-on-package-fingerprints.txt): Don't include package fingerprints in consensus documents
-* [`314-allow-markdown-proposals.md`](/proposals/314-allow-markdown-proposals.md): Allow Markdown for proposal format
+* [`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
+* [`318-limit-protovers.md`](/proposals/318-limit-protovers.md): Limit protover values to 0-63
 
 
 ## FINISHED proposals: implemented, specs not merged
@@ -70,6 +67,10 @@ themselves still need to be merged into the specifications proper.
 * [`217-ext-orport-auth.txt`](/proposals/217-ext-orport-auth.txt): Tor Extended ORPort Authentication
 * [`232-pluggable-transports-through-proxy.txt`](/proposals/232-pluggable-transports-through-proxy.txt): Pluggable Transport through SOCKS proxy
 * [`260-rend-single-onion.txt`](/proposals/260-rend-single-onion.txt): Rendezvous Single Onion Services
+* [`282-remove-named-from-consensus.txt`](/proposals/282-remove-named-from-consensus.txt): Remove "Named" and "Unnamed" handling from consensus voting
+* [`301-dont-vote-on-package-fingerprints.txt`](/proposals/301-dont-vote-on-package-fingerprints.txt): Don't include package fingerprints in consensus documents
+* [`310-bandaid-on-guard-selection.txt`](/proposals/310-bandaid-on-guard-selection.txt): Towards load-balancing in Prop 271
+* [`314-allow-markdown-proposals.md`](/proposals/314-allow-markdown-proposals.md): Allow Markdown for proposal format
 
 
 ## META proposals: about the proposal process
@@ -92,6 +93,7 @@ These proposals describe a process or project, but aren't actually
 proposed changes in the Tor specifications.
 
 * [`159-exit-scanning.txt`](/proposals/159-exit-scanning.txt): Exit Scanning
+* [`300-walking-onions.txt`](/proposals/300-walking-onions.txt): Walking Onions: Scaling and Saving Bandwidth
 
 
 # Preliminary proposals
@@ -102,17 +104,9 @@ These proposals have been marked as a draft by their author or the editors,
 indicating that they aren't yet in a complete form.  They're still open for
 discussion.
 
-* [`240-auth-cert-revocation.txt`](/proposals/240-auth-cert-revocation.txt): Early signing key revocation for directory authorities
 * [`273-exit-relay-pinning.txt`](/proposals/273-exit-relay-pinning.txt): Exit relay pinning for web services
 * [`294-tls-1.3.txt`](/proposals/294-tls-1.3.txt): TLS 1.3 Migration
-* [`300-walking-onions.txt`](/proposals/300-walking-onions.txt): Walking Onions: Scaling and Saving Bandwidth
-* [`303-protover-removal-policy.txt`](/proposals/303-protover-removal-policy.txt): When and how to remove support for protocol versions
-* [`307-onionbalance-v3.txt`](/proposals/307-onionbalance-v3.txt): Onion Balance Support for Onion Service v3
-* [`308-counter-galois-onion.txt`](/proposals/308-counter-galois-onion.txt): Counter Galois Onion: A New Proposal for Forward-Secure Relay Cryptography
 * [`309-optimistic-socks-in-tor.txt`](/proposals/309-optimistic-socks-in-tor.txt): Optimistic SOCKS Data
-* [`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
 * [`316-flashflow.txt`](/proposals/316-flashflow.txt): FlashFlow: A Secure Speed Test for Tor (Parent Proposal)
 
 
@@ -125,10 +119,10 @@ certain changes.
 * [`219-expanded-dns.txt`](/proposals/219-expanded-dns.txt): Support for full DNS and DNSSEC resolution in Tor
 * [`245-tap-out.txt`](/proposals/245-tap-out.txt): Deprecating and removing the TAP circuit extension protocol
 * [`248-removing-rsa-identities.txt`](/proposals/248-removing-rsa-identities.txt): Remove all RSA identity keys
-* [`254-padding-negotiation.txt`](/proposals/254-padding-negotiation.txt): Padding Negotiation
 * [`269-hybrid-handshake.txt`](/proposals/269-hybrid-handshake.txt): Transitionally secure hybrid handshakes
 * [`279-naming-layer-api.txt`](/proposals/279-naming-layer-api.txt): A Name System API for Tor Onion Services
 * [`291-two-guard-nodes.txt`](/proposals/291-two-guard-nodes.txt): The move to two guard nodes
+* [`317-secure-dns-name-resolution.txt`](/proposals/317-secure-dns-name-resolution.txt): Improve security aspects of DNS name resolution
 
 
 ## NEEDS-RESEARCH proposals: blocking on research
@@ -223,6 +217,7 @@ necessary.
 * [`244-use-rfc5705-for-tls-binding.txt`](/proposals/244-use-rfc5705-for-tls-binding.txt): Use RFC5705 Key Exporting in our AUTHENTICATE calls
 * [`250-commit-reveal-consensus.txt`](/proposals/250-commit-reveal-consensus.txt): Random Number Generation During Tor Voting
 * [`251-netflow-padding.txt`](/proposals/251-netflow-padding.txt): Padding for netflow record resolution reduction
+* [`254-padding-negotiation.txt`](/proposals/254-padding-negotiation.txt): Padding Negotiation
 * [`264-subprotocol-versions.txt`](/proposals/264-subprotocol-versions.txt): Putting version numbers on the Tor subprotocols
 * [`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
@@ -249,13 +244,16 @@ confront the problems that they try to solve.
 * [`133-unreachable-ors.txt`](/proposals/133-unreachable-ors.txt): Incorporate Unreachable ORs into the Tor Network
 * [`172-circ-getinfo-option.txt`](/proposals/172-circ-getinfo-option.txt): GETINFO controller option for circuit information
 * [`177-flag-abstention.txt`](/proposals/177-flag-abstention.txt): Abstaining from votes on individual flags
+* [`188-bridge-guards.txt`](/proposals/188-bridge-guards.txt): Bridge Guards and other anti-enumeration defenses
 * [`211-mapaddress-tor-status.txt`](/proposals/211-mapaddress-tor-status.txt): Internal Mapaddress for Tor Configuration Testing
 * [`223-ace-handshake.txt`](/proposals/223-ace-handshake.txt): Ace: Improved circuit-creation key exchange
 * [`226-bridgedb-database-improvements.txt`](/proposals/226-bridgedb-database-improvements.txt): "Scalability and Stability Improvements to BridgeDB: Switching to a Distributed Database System and RDBMS"
 * [`242-better-families.txt`](/proposals/242-better-families.txt): Better performance and usability for the MyFamily option
 * [`255-hs-load-balancing.txt`](/proposals/255-hs-load-balancing.txt): Controller features to allow for load-balancing hidden services
 * [`256-key-revocation.txt`](/proposals/256-key-revocation.txt): Key revocation for relays and authorities
+* [`262-rekey-circuits.txt`](/proposals/262-rekey-circuits.txt): Re-keying live circuits with new cryptographic material
 * [`281-bulk-md-download.txt`](/proposals/281-bulk-md-download.txt): Downloading microdescriptors in bulk
+* [`307-onionbalance-v3.txt`](/proposals/307-onionbalance-v3.txt): Onion Balance Support for Onion Service v3
 
 
 ## SUPERSEDED proposals: replaced by something else
@@ -286,6 +284,7 @@ implemented.
 * [`252-single-onion.txt`](/proposals/252-single-onion.txt): Single Onion Services
 * [`266-removing-current-obsolete-clients.txt`](/proposals/266-removing-current-obsolete-clients.txt): Removing current obsolete clients from the Tor network
 * [`280-privcount-in-tor.txt`](/proposals/280-privcount-in-tor.txt): Privacy-Preserving Statistics with Privcount in Tor
+* [`299-ip-failure-count.txt`](/proposals/299-ip-failure-count.txt): Preferring IPv4 or IPv6 based on IP Version Failure Count
 
 
 ## DEAD, REJECTED, OBSOLETE proposals: not in our plans
@@ -339,6 +338,7 @@ longer relevant (the proposal is OBSOLETE).
 * [`263-ntru-for-pq-handshake.txt`](/proposals/263-ntru-for-pq-handshake.txt): Request to change key exchange protocol for handshake v1.2 [OBSOLETE]
 * [`268-guard-selection.txt`](/proposals/268-guard-selection.txt): New Guard Selection Behaviour [OBSOLETE]
 * [`270-newhope-hybrid-handshake.txt`](/proposals/270-newhope-hybrid-handshake.txt): RebelAlliance: A Post-Quantum Secure Hybrid Handshake Based on NewHope [OBSOLETE]
+* [`276-lower-bw-granularity.txt`](/proposals/276-lower-bw-granularity.txt): Report bandwidth with lower granularity in consensus documents [DEAD]
 * [`286-hibernation-api.txt`](/proposals/286-hibernation-api.txt): Controller APIs for hibernation access on mobile [REJECTED]
 * [`320-tap-out-again.md`](/proposals/320-tap-out-again.md): Removing TAP usage from v2 onion services [REJECTED]