Cautiously update status of proposals 149,169,174,176,177.

6 files changed, 16 insertions, 15 deletions

diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index ebeeb90..48ec6a8 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -69,7 +69,7 @@ Proposals by number:
 146  Add new flag to reflect long-term stability [OPEN]
 147  Eliminate the need for v2 directories in generating v3 directories [ACCEPTED]
 148  Stream end reasons from the client side should be uniform [CLOSED]
-149  Using data from NETINFO cells [OPEN]
+149  Using data from NETINFO cells [DRAFT]
 150  Exclude Exit Nodes from a circuit [CLOSED]
 151  Improving Tor Path Selection [FINISHED]
 152  Optionally allow exit from single-hop circuits [CLOSED]
@@ -89,15 +89,15 @@ Proposals by number:
 166  Including Network Statistics in Extra-Info Documents [ACCEPTED]
 167  Vote on network parameters in consensus [CLOSED]
 168  Reduce default circuit window [OPEN]
-169  Eliminate TLS renegotiation for the Tor connection handshake [DRAFT]
+169  Eliminate TLS renegotiation for the Tor connection handshake [SUPERSEDED]
 170  Configuration options regarding circuit building [DRAFT]
 171  Separate streams across circuits by connection metadata [OPEN]
 172  GETINFO controller option for circuit information [ACCEPTED]
 173  GETINFO Option Expansion [ACCEPTED]
-174  Optimistic Data for Tor: Server Side [OPEN]
+174  Optimistic Data for Tor: Server Side [ACCEPTED]
 175  Automatically promoting Tor clients to nodes [DRAFT]
-176  Proposed version-3 link handshake for Tor [DRAFT]
-177  Abstaining from votes on individual flags [DRAFT]
+176  Proposed version-3 link handshake for Tor [OPEN]
+177  Abstaining from votes on individual flags [OPEN]
 178  Require majority of authorities to vote for consensus parameters [DRAFT]
 
 
@@ -109,11 +109,9 @@ Proposals by status:
    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
-   169  Eliminate TLS renegotiation for the Tor connection handshake [for 0.2.2]
+   149  Using data from NETINFO cells [for 0.2.1.x]
    170  Configuration options regarding circuit building
    175  Automatically promoting Tor clients to nodes
-   176  Proposed version-3 link handshake for Tor [for 0.2.3]
-   177  Abstaining from votes on individual flags
    178  Require majority of authorities to vote for consensus parameters
  NEEDS-REVISION:
    131  Help users to verify they are using Tor
@@ -121,7 +119,6 @@ Proposals by status:
    143  Improvements of Distributed Storage for Tor Hidden Service Descriptors [for 0.2.1.x]
    145  Separate "suitable as a guard" from "suitable as a new guard" [for 0.2.1.x]
    146  Add new flag to reflect long-term stability [for 0.2.1.x]
-   149  Using data from NETINFO cells [for 0.2.1.x]
    156  Tracking blocked ports on the client side [for 0.2.?]
    158  Clients download consensus + microdescriptors
    159  Exit Scanning
@@ -131,7 +128,8 @@ Proposals by status:
    165  Easy migration for voting authority sets
    168  Reduce default circuit window [for 0.2.2]
    171  Separate streams across circuits by connection metadata
-   174  Optimistic Data for Tor: Server Side
+   176  Proposed version-3 link handshake for Tor [for 0.2.3]
+   177  Abstaining from votes on individual flags
  ACCEPTED:
    110  Avoiding infinite length circuits [for 0.2.1.x] [in 0.2.1.3-alpha]
    117  IPv6 exits [for 0.2.1.x]
@@ -142,6 +140,7 @@ Proposals by status:
    166  Including Network Statistics in Extra-Info Documents [for 0.2.2]
    172  GETINFO controller option for circuit information
    173  GETINFO Option Expansion
+   174  Optimistic Data for Tor: Server Side
  META:
    000  Index of Tor Proposals
    001  The Tor Proposal Process
@@ -187,6 +186,7 @@ Proposals by status:
    124  Blocking resistant TLS certificate usage
    153  Automatic software update protocol
    154  Automatic Software Update Protocol
+   169  Eliminate TLS renegotiation for the Tor connection handshake
  DEAD:
    100  Tor Unreliable Datagram Extension Proposal
    115  Two Hop Paths
diff --git a/proposals/149-using-netinfo-data.txt b/proposals/149-using-netinfo-data.txt
index 8bf8375..cf2945a 100644
--- a/proposals/149-using-netinfo-data.txt
+++ b/proposals/149-using-netinfo-data.txt
@@ -2,7 +2,7 @@ Filename: 149-using-netinfo-data.txt
 Title: Using data from NETINFO cells
 Author: Nick Mathewson
 Created: 2-Jul-2008
-Status: Open
+Status: Draft
 Target: 0.2.1.x
 
 Overview
diff --git a/proposals/169-eliminating-renegotiation.txt b/proposals/169-eliminating-renegotiation.txt
index 6311124..fe4cd58 100644
--- a/proposals/169-eliminating-renegotiation.txt
+++ b/proposals/169-eliminating-renegotiation.txt
@@ -2,8 +2,9 @@ Filename: 169-eliminating-renegotiation.txt
 Title: Eliminate TLS renegotiation for the Tor connection handshake
 Author: Nick Mathewson
 Created: 27-Jan-2010
-Status: Draft
+Status: Superseded
 Target: 0.2.2
+Superseded-By: 176
 
 1. Overview
 
diff --git a/proposals/174-optimistic-data-server.txt b/proposals/174-optimistic-data-server.txt
index d97c45e..88616b8 100644
--- a/proposals/174-optimistic-data-server.txt
+++ b/proposals/174-optimistic-data-server.txt
@@ -2,7 +2,7 @@ Filename: 174-optimistic-data-server.txt
 Title: Optimistic Data for Tor: Server Side
 Author: Ian Goldberg
 Created: 2-Aug-2010
-Status: Open
+Status: Accepted
 
 Overview:
 
diff --git a/proposals/176-revising-handshake.txt b/proposals/176-revising-handshake.txt
index db7ea4a..2215cf5 100644
--- a/proposals/176-revising-handshake.txt
+++ b/proposals/176-revising-handshake.txt
@@ -2,7 +2,7 @@ Filename: 176-revising-handshake.txt
 Title: Proposed version-3 link handshake for Tor
 Author: Nick Mathewson
 Created: 31-Jan-2011
-Status: Draft
+Status: Open
 Target: 0.2.3
 Supersedes: 169
 
diff --git a/proposals/177-flag-abstention.txt b/proposals/177-flag-abstention.txt
index 0b4a9ba..46d68e6 100644
--- a/proposals/177-flag-abstention.txt
+++ b/proposals/177-flag-abstention.txt
@@ -2,7 +2,7 @@ Filename: 177-flag-abstention.txt
 Title: Abstaining from votes on individual flags
 Author: Nick Mathewson
 Created: 14 Feb 2011
-Status: Draft
+Status: Open
 
 Overview: