Update proposal target versions

This includes marking "for 0.2.3" everything arma and I suggested
should be "tageted" for 0.2.3, and unmarking everything that was not
done but targetted for 0.2.2 or earlier.

23 files changed, 51 insertions, 44 deletions

diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index 4de2634..dca67dc 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -38,7 +38,7 @@ Proposals by number:
 115  Two Hop Paths [DEAD]
 116  Two hop paths from entry guards [DEAD]
 117  IPv6 exits [ACCEPTED]
-118  Advertising multiple ORPorts at once [ACCEPTED]
+118  Advertising multiple ORPorts at once [NEEDS-REVISION]
 119  New PROTOCOLINFO command for controllers [CLOSED]
 120  Shutdown descriptors when Tor servers stop [DEAD]
 121  Hidden Service Authentication [FINISHED]
@@ -65,8 +65,8 @@ Proposals by number:
 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]
-145  Separate "suitable as a guard" from "suitable as a new guard" [OPEN]
-146  Add new flag to reflect long-term stability [OPEN]
+145  Separate "suitable as a guard" from "suitable as a new guard" [NEEDS-RESEARCH]
+146  Add new flag to reflect long-term stability [NEEDS-RESEARCH]
 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 [SUPERSEDED]
@@ -91,7 +91,7 @@ Proposals by number:
 168  Reduce default circuit window [OPEN]
 169  Eliminate TLS renegotiation for the Tor connection handshake [SUPERSEDED]
 170  Configuration options regarding circuit building [SUPERSEDED]
-171  Separate streams across circuits by connection metadata [OPEN]
+171  Separate streams across circuits by connection metadata [ACCEPTED]
 172  GETINFO controller option for circuit information [ACCEPTED]
 173  GETINFO Option Expansion [ACCEPTED]
 174  Optimistic Data for Tor: Server Side [CLOSED]
@@ -112,32 +112,33 @@ Proposals by status:
    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
-   179  TLS certificate and parameter normalization
+   179  TLS certificate and parameter normalization [for 0.2.3.x]
  NEEDS-REVISION:
+   118  Advertising multiple ORPorts at once
    131  Help users to verify they are using Tor
+ NEEDS-RESEARCH:
+   145  Separate "suitable as a guard" from "suitable as a new guard"
+   146  Add new flag to reflect long-term stability
  OPEN:
-   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]
-   156  Tracking blocked ports on the client side [for 0.2.?]
+   143  Improvements of Distributed Storage for Tor Hidden Service Descriptors
+   156  Tracking blocked ports on the client side
    159  Exit Scanning
-   164  Reporting the status of server votes [for 0.2.2]
+   164  Reporting the status of server votes
    165  Easy migration for voting authority sets
-   168  Reduce default circuit window [for 0.2.2]
-   171  Separate streams across circuits by connection metadata
+   168  Reduce default circuit window
    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
-   180  Pluggable transports for circumvention
+   177  Abstaining from votes on individual flags [for 0.2.3.x]
+   178  Require majority of authorities to vote for consensus parameters [for 0.2.3.x]
+   180  Pluggable transports for circumvention [for 0.2.3.x]
  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]
-   118  Advertising multiple ORPorts at once [for 0.2.1.x]
-   140  Provide diffs between consensuses [for 0.2.2.x]
-   147  Eliminate the need for v2 directories in generating v3 directories [for 0.2.1.x]
-   157  Make certificate downloads specific [for 0.2.1.x]
-   172  GETINFO controller option for circuit information
-   173  GETINFO Option Expansion
+   110  Avoiding infinite length circuits [for 0.2.3.x] [in 0.2.1.3-alpha]
+   117  IPv6 exits [for 0.2.3.x]
+   140  Provide diffs between consensuses
+   147  Eliminate the need for v2 directories in generating v3 directories [for 0.2.3.x]
+   157  Make certificate downloads specific [for 0.2.3.x]
+   171  Separate streams across circuits by connection metadata [for 0.2.3.x]
+   172  GETINFO controller option for circuit information [for 0.2.3.x]
+   173  GETINFO Option Expansion [for 0.2.3.x]
  META:
    000  Index of Tor Proposals
    001  The Tor Proposal Process
@@ -147,10 +148,10 @@ Proposals by status:
    121  Hidden Service Authentication [in 0.2.1.x]
    151  Improving Tor Path Selection
    155  Four Improvements of Hidden Service Performance [in 0.2.1.x]
-   158  Clients download consensus + microdescriptors
+   158  Clients download consensus + microdescriptors [in 0.2.3.1-alpha]
    160  Authorities vote for bandwidth offsets in consensus [for 0.2.2.x]
    161  Computing Bandwidth Adjustments [for 0.2.2.x]
-   162  Publish the consensus in multiple flavors [for 0.2.2]
+   162  Publish the consensus in multiple flavors [in 0.2.3.1-alpha]
  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]
@@ -180,7 +181,7 @@ Proposals by status:
    152  Optionally allow exit from single-hop circuits [in 0.2.1.6-alpha]
    166  Including Network Statistics in Extra-Info Documents [for 0.2.2]
    167  Vote on network parameters in consensus [in 0.2.2]
-   174  Optimistic Data for Tor: Server Side
+   174  Optimistic Data for Tor: Server Side [in 0.2.3.1-alpha]
  SUPERSEDED:
    112  Bring Back Pathlen Coin Weight
    113  Simplifying directory authority administration
diff --git a/proposals/110-avoid-infinite-circuits.txt b/proposals/110-avoid-infinite-circuits.txt
index fffc41c..5da3261 100644
--- a/proposals/110-avoid-infinite-circuits.txt
+++ b/proposals/110-avoid-infinite-circuits.txt
@@ -3,7 +3,7 @@ Title: Avoiding infinite length circuits
 Author: Roger Dingledine
 Created: 13-Mar-2007
 Status: Accepted
-Target: 0.2.1.x
+Target: 0.2.3.x
 Implemented-In: 0.2.1.3-alpha
 
 History:
diff --git a/proposals/117-ipv6-exits.txt b/proposals/117-ipv6-exits.txt
index fe458ce..648c520 100644
--- a/proposals/117-ipv6-exits.txt
+++ b/proposals/117-ipv6-exits.txt
@@ -3,7 +3,7 @@ Title: IPv6 exits
 Author: coderman
 Created: 10-Jul-2007
 Status: Accepted
-Target: 0.2.1.x
+Target: 0.2.3.x
 
 Overview
 
diff --git a/proposals/118-multiple-orports.txt b/proposals/118-multiple-orports.txt
index 2381ec7..64a6000 100644
--- a/proposals/118-multiple-orports.txt
+++ b/proposals/118-multiple-orports.txt
@@ -2,8 +2,10 @@ Filename: 118-multiple-orports.txt
 Title: Advertising multiple ORPorts at once
 Author: Nick Mathewson
 Created: 09-Jul-2007
-Status: Accepted
-Target: 0.2.1.x
+Status: Needs-Revision
+
+[Needs Revision: This proposal needs revision to come up to 2011 standards
+and take microdescriptors into account.]
 
 Overview:
 
diff --git a/proposals/140-consensus-diffs.txt b/proposals/140-consensus-diffs.txt
index 8bc4070..f3fcb2b 100644
--- a/proposals/140-consensus-diffs.txt
+++ b/proposals/140-consensus-diffs.txt
@@ -3,7 +3,6 @@ Title: Provide diffs between consensuses
 Author: Peter Palfrader
 Created: 13-Jun-2008
 Status: Accepted
-Target: 0.2.2.x
 
 0. History
 
diff --git a/proposals/143-distributed-storage-improvements.txt b/proposals/143-distributed-storage-improvements.txt
index 0f7468f..fcd0773 100644
--- a/proposals/143-distributed-storage-improvements.txt
+++ b/proposals/143-distributed-storage-improvements.txt
@@ -3,7 +3,6 @@ Title: Improvements of Distributed Storage for Tor Hidden Service Descriptors
 Author: Karsten Loesing
 Created: 28-Jun-2008
 Status: Open
-Target: 0.2.1.x
 
 Change history:
 
diff --git a/proposals/145-newguard-flag.txt b/proposals/145-newguard-flag.txt
index 9e61e30..d2eea6d 100644
--- a/proposals/145-newguard-flag.txt
+++ b/proposals/145-newguard-flag.txt
@@ -2,8 +2,7 @@ Filename: 145-newguard-flag.txt
 Title: Separate "suitable as a guard" from "suitable as a new guard"
 Author: Nick Mathewson
 Created: 1-Jul-2008
-Status: Open
-Target: 0.2.1.x
+Status: Needs-Research
 
 [This could be obsoleted by proposal 141, which could replace NewGuard
 with a Guard weight.]
diff --git a/proposals/146-long-term-stability.txt b/proposals/146-long-term-stability.txt
index 9af0017..0fe1464 100644
--- a/proposals/146-long-term-stability.txt
+++ b/proposals/146-long-term-stability.txt
@@ -2,8 +2,7 @@ Filename: 146-long-term-stability.txt
 Title: Add new flag to reflect long-term stability
 Author: Nick Mathewson
 Created: 19-Jun-2008
-Status: Open
-Target: 0.2.1.x
+Status: Needs-Research
 
 Overview
 
diff --git a/proposals/147-prevoting-opinions.txt b/proposals/147-prevoting-opinions.txt
index 3d9659c..44c48f3 100644
--- a/proposals/147-prevoting-opinions.txt
+++ b/proposals/147-prevoting-opinions.txt
@@ -3,7 +3,7 @@ Title: Eliminate the need for v2 directories in generating v3 directories
 Author: Nick Mathewson
 Created: 2-Jul-2008
 Status: Accepted
-Target: 0.2.1.x
+Target: 0.2.3.x
 
 Overview
 
diff --git a/proposals/156-tracking-blocked-ports.txt b/proposals/156-tracking-blocked-ports.txt
index 419de7e..399d9e8 100644
--- a/proposals/156-tracking-blocked-ports.txt
+++ b/proposals/156-tracking-blocked-ports.txt
@@ -3,7 +3,7 @@ Title: Tracking blocked ports on the client side
 Author: Robert Hogan
 Created: 14-Oct-2008
 Status: Open
-Target: 0.2.?
+
 
 Motivation:
 Tor clients that are behind extremely restrictive firewalls can end up
diff --git a/proposals/157-specific-cert-download.txt b/proposals/157-specific-cert-download.txt
index 204b209..739c580 100644
--- a/proposals/157-specific-cert-download.txt
+++ b/proposals/157-specific-cert-download.txt
@@ -3,7 +3,7 @@ Title: Make certificate downloads specific
 Author: Nick Mathewson
 Created: 2-Dec-2008
 Status: Accepted
-Target: 0.2.1.x
+Target: 0.2.3.x
 
 History:
 
diff --git a/proposals/158-microdescriptors.txt b/proposals/158-microdescriptors.txt
index bbfafba..39a0ed7 100644
--- a/proposals/158-microdescriptors.txt
+++ b/proposals/158-microdescriptors.txt
@@ -3,6 +3,7 @@ Title: Clients download consensus + microdescriptors
 Author: Roger Dingledine
 Created: 17-Jan-2009
 Status: Finished
+Implemented-In: 0.2.3.1-alpha
 
 0. History
 
diff --git a/proposals/162-consensus-flavors.txt b/proposals/162-consensus-flavors.txt
index b027b42..f97143b 100644
--- a/proposals/162-consensus-flavors.txt
+++ b/proposals/162-consensus-flavors.txt
@@ -2,7 +2,7 @@ Filename: 162-consensus-flavors.txt
 Title: Publish the consensus in multiple flavors
 Author: Nick Mathewson
 Created: 14-May-2009
-Target: 0.2.2
+Implemented-In: 0.2.3.1-alpha
 Status: Finished
 
 Overview:
diff --git a/proposals/164-reporting-server-status.txt b/proposals/164-reporting-server-status.txt
index 705f5f1..c20460f 100644
--- a/proposals/164-reporting-server-status.txt
+++ b/proposals/164-reporting-server-status.txt
@@ -2,7 +2,6 @@ Filename: 164-reporting-server-status.txt
 Title: Reporting the status of server votes
 Author: Nick Mathewson
 Created: 22-May-2009
-Target: 0.2.2
 Status: Open
 
 
diff --git a/proposals/168-reduce-circwindow.txt b/proposals/168-reduce-circwindow.txt
index a746286..aed1d61 100644
--- a/proposals/168-reduce-circwindow.txt
+++ b/proposals/168-reduce-circwindow.txt
@@ -3,7 +3,7 @@ Title: Reduce default circuit window
 Author: Roger Dingledine
 Created: 12-Aug-2009
 Status: Open
-Target: 0.2.2
+
 
 0. History
 
diff --git a/proposals/171-separate-streams.txt b/proposals/171-separate-streams.txt
index 9842265..3b8b826 100644
--- a/proposals/171-separate-streams.txt
+++ b/proposals/171-separate-streams.txt
@@ -3,7 +3,8 @@ Title: Separate streams across circuits by connection metadata
 Author: Robert Hogan, Jacob Appelbaum, Damon McCoy, Nick Mathewson
 Created: 21-Oct-2008
 Modified: 7-Dec-2010
-Status: Open
+Status: Accepted
+Target: 0.2.3.x
 
 Summary:
 
diff --git a/proposals/172-circ-getinfo-option.txt b/proposals/172-circ-getinfo-option.txt
index b7fd79c..f716194 100644
--- a/proposals/172-circ-getinfo-option.txt
+++ b/proposals/172-circ-getinfo-option.txt
@@ -3,6 +3,7 @@ Title: GETINFO controller option for circuit information
 Author: Damian Johnson
 Created: 03-June-2010
 Status: Accepted
+Target: 0.2.3.x
 
 Overview:
 
diff --git a/proposals/173-getinfo-option-expansion.txt b/proposals/173-getinfo-option-expansion.txt
index 54356c9..b9ba4bd 100644
--- a/proposals/173-getinfo-option-expansion.txt
+++ b/proposals/173-getinfo-option-expansion.txt
@@ -3,6 +3,7 @@ Title: GETINFO Option Expansion
 Author: Damian Johnson
 Created: 02-June-2010
 Status: Accepted
+Target: 0.2.3.x
 
 Overview:
 
diff --git a/proposals/174-optimistic-data-server.txt b/proposals/174-optimistic-data-server.txt
index 95c1386..193565b 100644
--- a/proposals/174-optimistic-data-server.txt
+++ b/proposals/174-optimistic-data-server.txt
@@ -3,6 +3,7 @@ Title: Optimistic Data for Tor: Server Side
 Author: Ian Goldberg
 Created: 2-Aug-2010
 Status: Closed
+Implemented-In: 0.2.3.1-alpha
 
 Overview:
 
diff --git a/proposals/177-flag-abstention.txt b/proposals/177-flag-abstention.txt
index 46d68e6..8c83504 100644
--- a/proposals/177-flag-abstention.txt
+++ b/proposals/177-flag-abstention.txt
@@ -3,6 +3,7 @@ Title: Abstaining from votes on individual flags
 Author: Nick Mathewson
 Created: 14 Feb 2011
 Status: Open
+Target: 0.2.3.x
 
 Overview:
 
diff --git a/proposals/178-param-voting.txt b/proposals/178-param-voting.txt
index b5664b5..2c4abf6 100644
--- a/proposals/178-param-voting.txt
+++ b/proposals/178-param-voting.txt
@@ -1,8 +1,9 @@
 Filename: 178-param-voting.txt
 Title: Require majority of authorities to vote for consensus parameters
-Author: Sebastian Hahn	
+Author: Sebastian Hahn
 Created: 16-Feb-2011
 Status: Open
+Target: 0.2.3.x
 
 Overview:
 
diff --git a/proposals/179-TLS-cert-and-parameter-normalization.txt b/proposals/179-TLS-cert-and-parameter-normalization.txt
index acad79a..7ad3ed8 100644
--- a/proposals/179-TLS-cert-and-parameter-normalization.txt
+++ b/proposals/179-TLS-cert-and-parameter-normalization.txt
@@ -3,6 +3,7 @@ Title: TLS certificate and parameter normalization
 Author: Jacob Appelbaum, Gladys Shufflebottom
 Created: 16-Feb-2011
 Status: Draft
+Target: 0.2.3.x
 
 
         Draft spec for TLS certificate and handshake normalization
diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt
index f51a9ff..16ad761 100644
--- a/proposals/180-pluggable-transport.txt
+++ b/proposals/180-pluggable-transport.txt
@@ -3,6 +3,7 @@ Title: Pluggable transports for circumvention
 Author: Jacob Appelbaum, Nick Mathewson
 Created: 15-Oct-2010
 Status: Open
+Target: 0.2.3.x
 
 Overview