Update metafiles

3 files changed, 22 insertions, 75 deletions

diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index ffa8cf3..7ef953f 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -53,7 +53,7 @@ Proposals by number:
 130  Version 2 Tor connection protocol [CLOSED]
 131  Help users to verify they are using Tor [OBSOLETE]
 132  A Tor Web Service For Verifying Correct Browser Configuration [OBSOLETE]
-133  Incorporate Unreachable ORs into the Tor Network [DRAFT]
+133  Incorporate Unreachable ORs into the Tor Network [RESERVE]
 134  More robust consensus voting with diverse authority sets [REJECTED]
 135  Simplify Configuration of Private Tor Networks [CLOSED]
 136  Mass authority migration with legacy keys [CLOSED]
@@ -61,10 +61,10 @@ Proposals by number:
 138  Remove routers that are not Running from consensus documents [CLOSED]
 139  Download consensus documents only when it will be trusted [CLOSED]
 140  Provide diffs between consensuses [ACCEPTED]
-141  Download server descriptors on demand [DRAFT]
+141  Download server descriptors on demand [OBSOLETE]
 142  Combine Introduction and Rendezvous Points [DEAD]
 143  Improvements of Distributed Storage for Tor Hidden Service Descriptors [OPEN]
-144  Increase the diversity of circuits by detecting nodes belonging the same provider [DRAFT]
+144  Increase the diversity of circuits by detecting nodes belonging the same provider [OBSOLETE]
 145  Separate "suitable as a guard" from "suitable as a new guard" [SUPERSEDED]
 146  Add new flag to reflect long-term stability [SUPERSEDED]
 147  Eliminate the need for v2 directories in generating v3 directories [REJECTED]
@@ -79,7 +79,7 @@ Proposals by number:
 156  Tracking blocked ports on the client side [SUPERSEDED]
 157  Make certificate downloads specific [CLOSED]
 158  Clients download consensus + microdescriptors [FINISHED]
-159  Exit Scanning [OPEN]
+159  Exit Scanning [INFORMATIONAL]
 160  Authorities vote for bandwidth offsets in consensus [FINISHED]
 161  Computing Bandwidth Adjustments [FINISHED]
 162  Publish the consensus in multiple flavors [FINISHED]
@@ -178,9 +178,6 @@ Proposals by number:
 Proposals by status:
 
  DRAFT:
-   133  Incorporate Unreachable ORs into the Tor Network
-   141  Download server descriptors on demand
-   144  Increase the diversity of circuits by detecting nodes belonging the same provider
    175  Automatically promoting Tor clients to nodes
    182  Credit Bucket
    195  TLS certificate normalization for Tor 0.2.4.x [for 0.2.4.x]
@@ -207,7 +204,6 @@ Proposals by status:
    190  Bridge Client Authorization Based on a Shared Secret
  OPEN:
    143  Improvements of Distributed Storage for Tor Hidden Service Descriptors
-   159  Exit Scanning
    164  Reporting the status of server votes
    165  Easy migration for voting authority sets
    168  Reduce default circuit window
@@ -344,5 +340,10 @@ Proposals by status:
    127  Relaying dirport requests to Tor download site / website
    131  Help users to verify they are using Tor
    132  A Tor Web Service For Verifying Correct Browser Configuration
+   141  Download server descriptors on demand
+   144  Increase the diversity of circuits by detecting nodes belonging the same provider
  RESERVE:
+   133  Incorporate Unreachable ORs into the Tor Network
    211  Internal Mapaddress for Tor Configuration Testing [for 0.2.4.x+]
+ INFORMATIONAL:
+   159  Exit Scanning
diff --git a/proposals/proposal-status.txt b/proposals/proposal-status.txt
index 4f278ee..b79ccb0 100644
--- a/proposals/proposal-status.txt
+++ b/proposals/proposal-status.txt
@@ -55,7 +55,7 @@ again to remind me!
           revised the paragraph.
 
 
-133  Incorporate Unreachable ORs into the Tor Network
+133  Incorporate Unreachable ORs into the Tor Network [RESERVE]
 
      This proposal had an idea for letting ORs that can only make
      outgoing connections still relay data usefully in the network.
@@ -64,12 +64,12 @@ again to remind me!
      who wants to analyze new network topologies should definitely
      have a look. (5/2011)
 
-     For this I think we should introduce a new proposal status,
-     "RESERVE". A proposal is "on reserve" if we're not currently
-     planning to implement it, but we might someday want to do so if we
-     decide that what it provides is a great idea. (9/2015)
+     For this I have introduced a new proposal status, "RESERVE". A
+     proposal is "in reserve" if we're not currently planning to
+     implement it, but we might someday want to do so if we decide that
+     what it provides is a great idea. (9/2015)
 
-140  Provide diffs between consensuses
+140  Provide diffs between consensuses [ACCEPTED]
 
      This proposal describes a way to transmit less directory
      traffic by sending only differences between consensuses, rather
@@ -77,22 +77,6 @@ again to remind me!
      GSoC project last summer; it is still under revision and on target
      for merge into 0.2.8.  (See ticket #13339)  (9/2015)
 
-     This needs code review, and needs to marked as ACCCEPTED. (9/2015)
-
-141  Download server descriptors on demand
-
-     The idea of this proposal was for clients to only download the
-     consensus, and later ask nodes for their own server descriptors
-     while building the circuit through them.  It would make each
-     circuit more time-consuming to build, but make bootstrapping
-     much cheaper.
-
-     Microdescriptors obsolete a lot of this proposal, and present
-     some difficulties in using in a way compatible with
-     it. (6/2012)
-
-     I say mark this as OBSOLETE or RESERVE. (9/2015)
-
 143  Improvements of Distributed Storage for Tor Hidden Service
      Descriptors
 
@@ -115,41 +99,6 @@ again to remind me!
 
      Time to mark this as SUPERSEDED. (9/2015)
 
-144  Increase the diversity of circuits by detecting nodes
-     belonging the same provider
-
-     This is a version of the good idea, "Let's do routing in a way
-     that tries to keep from routing traffic through the same
-     provider too much!"  There are complex issues here that the
-     proposal doesn't completely address, but I think it might be a
-     fine idea for somebody to see how much more we know now than we
-     did in 2008, particularly in light of the relevant paper(s) by
-     Matt Edmann and Paul Syverson. (5/2011)
-
-     Mark as OBSOLETE. The research field has advanced very far since
-     this proposal, and new papers on this topic come out every year.
-     (9/2015)
-
-145  Separate "suitable as a guard" from "suitable as a new guard"
-     [NEEDS-RESEARCH]
-
-     Currently, the Guard flag means both "You can use this node as a
-     guard if you need to pick a new guard" and "If this node is
-     currently your guard, you can keep using it as a guard."  This
-     proposal tries to separate these two concepts, so that clients can
-     stop picking a router once it is full of existing clients using it
-     as a guard, but the clients currently on it won't all drop it.
-
-     It's not clear whether this has anonymity issues, and it's not
-     clear whether the imagined performance gains are actually
-     worthwhile.
-
-     This is probably superseded by proposal 236, which has a better
-     approach for weighting guard node selection probabilities; we
-     should probably close this ticket. (2/2015)
-
-     I say, mark as OBSOLETE. (9/2015)
-
 156  Tracking blocked ports on the client side
 
      This proposal provides a way for clients to learn which ports
@@ -177,13 +126,6 @@ again to remind me!
      This is likely also to be relevant for the ideas of proposal 241,
      and maybe superseded by some version of that proposal. (2/2015)
 
-159  Exit Scanning
-
-     This is an overview of SoaT, with some ideas for how to integrate
-     it into Tor. (5/2011)
-
-     (Mark as HISTORICAL? INFORMATIONAL?) (9/2015)
-
 164  Reporting the status of server votes
 
      This proposal explains a way for authorities to provide a
@@ -652,8 +594,12 @@ TAKE ANOTHER LOOK AT THESE:
 
 Since last time:
 
-      Proposals 127, 131, and 132 has been marked as obsolete.
+      Proposals 127, 131, 132, 141 has been marked as obsolete.
+
+      Proposals 133, and 211 is now "in-reserve".
+
+      Proposal 145 is superseded.
 
-      Proposal 211 is now "in-reserve".
+      Proposal 159 is informational.
 
       Proposals 242-252 are new.
diff --git a/proposals/reindex.py b/proposals/reindex.py
index 381099e..b442271 100755
--- a/proposals/reindex.py
+++ b/proposals/reindex.py
@@ -4,7 +4,7 @@ import re, os
 class Error(Exception): pass
 
 STATUSES = """DRAFT NEEDS-REVISION NEEDS-RESEARCH OPEN ACCEPTED META FINISHED
-   CLOSED SUPERSEDED DEAD REJECTED OBSOLETE RESERVE""".split()
+   CLOSED SUPERSEDED DEAD REJECTED OBSOLETE RESERVE INFORMATIONAL""".split()
 REQUIRED_FIELDS = [ "Filename", "Status", "Title" ]
 CONDITIONAL_FIELDS = { "OPEN" : [ "Target" ],
                        "ACCEPTED" : [ "Target "],