the bridge family proposal really resembles 'dead' more than it resembles

'finished'.

svn:r17546

diff --git a/doc/spec/proposals/000-index.txt b/doc/spec/proposals/000-index.txt
index e4c9dd37c9b9625b6918ed0fc7fadf40f6051a6e..5fe29c528b22383b0ce6664b3ed7cdf3994ff6a4 100644 (file)
--- a/doc/spec/proposals/000-index.txt
+++ b/doc/spec/proposals/000-index.txt
@@ -50,7 +50,7 @@ Proposals by number:
 125  Behavior for bridge users, bridge relays, and bridge authorities [CLOSED]
 126  Getting GeoIP data and publishing usage summaries [CLOSED]
 127  Relaying dirport requests to Tor download site / website [DRAFT]
-128  Families of private bridges [FINISHED]
+128  Families of private bridges [DEAD]
 129  Block Insecure Protocols by Default [CLOSED]
 130  Version 2 Tor connection protocol [CLOSED]
 131  Help users to verify they are using Tor [NEEDS-REVISION]
@@ -115,7 +115,6 @@ Proposals by status:
    099  Miscellaneous proposals
  FINISHED:
    121  Hidden Service Authentication [in 0.2.1.x]
-   128  Families of private bridges [in 0.2.0.x]
    155  Four Improvements of Hidden Service Performance [in 0.2.1.x]
  CLOSED:
    101  Voting on the Tor Directory System [in 0.2.0.x]
@@ -154,4 +153,5 @@ Proposals by status:
    115  Two Hop Paths
    116  Two hop paths from entry guards
    120  Shutdown descriptors when Tor servers stop
+   128  Families of private bridges
    142  Combine Introduction and Rendezvous Points

diff --git a/doc/spec/proposals/128-bridge-families.txt b/doc/spec/proposals/128-bridge-families.txt
index 653a2cf6d6b0deb7db82be8bada4de4ec95cc13c..e8a0050c3c1420d050f5836e00662a03fc40137c 100644 (file)
--- a/doc/spec/proposals/128-bridge-families.txt
+++ b/doc/spec/proposals/128-bridge-families.txt
@@ -4,11 +4,7 @@ Version: $Revision$
 Last-Modified: $Date$
 Author: Roger Dingledine
 Created: 2007-12-xx
-Status: Finished
-Implemented-In: 0.2.0.x
-
-  [This proposal is part implemented, and part dead (won't-implement).
-  Roger should add a note and merge it into the spec.]
+Status: Dead
 
 1. Overview
 
@@ -31,21 +27,40 @@ Implemented-In: 0.2.0.x
   out the details of how these volunteers find each other and decide to
   set up a family.
 
+2. Other notes.
+
+  somebody needs to run a bridge authority
+
+  it needs to have a torrc option to publish networkstatuses of its bridges
+
+  it should also do reachability testing just of those bridges
+
+  people ask for the bridge networkstatus by asking for a url that
+  contains a password. (it's safe to do this because of begin_dir.)
 
-somebody needs to run a bridge authority
+  so the bridge users need to know a) a password, and b) a bridge
+  authority line.
 
-it needs to have a torrc option to publish networkstatuses of its bridges
+  the bridge users need to know the bridge authority line.
 
-it should also do reachability testing just of those bridges
+  the bridge authority needs to know the password.
 
-people ask for the bridge networkstatus by asking for a url that
-contains a password. (it's safe to do this because of begin_dir.)
+3. Current state
 
-so the bridge users need to know a) a password, and b) a bridge
-authority line.
+  I implemented a BridgePassword config option. Bridge authorities
+  should set it, and users who want to use those bridge authorities
+  should set it.
 
-the bridge users need to know the bridge authority line.
+  Now there is a new directory URL "/tor/networkstatus-bridges" that
+  directory mirrors serve if BridgeAuthoritativeDir is set and it's a
+  begin_dir connection. It looks for the header
+    Authorization: Basic %s
+  where %s is the base-64 bridge password.
 
-the bridge authority needs to know the password.
+  I never got around to teaching clients how to set the header though,
+  so it may or may not, and may or may not do what we ultimate want.
 
+  I've marked this proposal dead; it really never should have left the
+  ideas/ directory. Somebody should pick it up sometime and finish the
+  design and implementation.