changes sitting in my trunk sandbox

svn:r15955

doc/TODO

@@ -124,6 +124,8 @@ Steven
   - Mike's question #3 on https://www.torproject.org/volunteer#Research
   - Worthwhile shipping TBB with some local html help files that come
     as bookmarks?
+  - Decide whether TBB should use Torbutton's "lock" feature.
+    http://archives.seul.org/or/cvs/Jun-2008/msg00186.html
 
 Andrew
   - Which bundles include Torbutton? Change the docs/tor-doc-foo pages

doc/spec/proposals/138-remove-down-routers-from-consensus.txt

@@ -5,7 +5,7 @@ Last-Modified: $Date$
 Author: Peter Palfrader
 Created: 11-Jun-2008
 Status: Closed
-Implemented-In: 0.2.1.x
+Implemented-In: 0.2.1.2-alpha
 
 1. Overview.
 

doc/spec/proposals/141-jit-sd-downloads.txt

@@ -29,7 +29,7 @@ Status: Draft
 2. What is in a server descriptor
 
   When a Tor client starts the first thing it will try to get is a
-  current network status document, a consensus signed by a majority
+  current network status document: a consensus signed by a majority
   of directory authorities.  This document is currently about 100
   Kilobytes in size, tho it will grow linearly with network size.
   This document lists all servers currently running on the network.
@@ -93,8 +93,8 @@ Status: Draft
 
   A server descriptor lists a server's IP address and TCP ports on which
   it accepts onion and directory connections.  Furthermore it contains
-  the onion key, a short lived RSA key to which clients encrypt CREATE
+  the onion key (a short lived RSA key to which clients encrypt CREATE
-  cells.
+  cells).
 
 2.5 Identity information