changes sitting in my trunk sandbox

svn:r15955

diff --git a/doc/TODO b/doc/TODO
index 0eb9d0a4765dbe4f36310acf7e0fb15f5d1895b2..da6c2c0dd868ea5d3bac96cc9beaa18484e5809a 100644 (file)
--- a/doc/TODO
+++ b/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

diff --git a/doc/spec/proposals/138-remove-down-routers-from-consensus.txt b/doc/spec/proposals/138-remove-down-routers-from-consensus.txt
index b19fe5ee29fb64c5c316ce0da7c021eb3a850717..a07764d536440efeebfdbaf0616fc31038c86409 100644 (file)
--- a/doc/spec/proposals/138-remove-down-routers-from-consensus.txt
+++ b/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.
 

diff --git a/doc/spec/proposals/141-jit-sd-downloads.txt b/doc/spec/proposals/141-jit-sd-downloads.txt
index c335f77cd9e66799aa35644482c65e59e958def9..b6d27c86e8ebca663728a2c54bcf7ce8dd8ddb87 100644 (file)
--- a/doc/spec/proposals/141-jit-sd-downloads.txt
+++ b/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
-  cells.
+  the onion key (a short lived RSA key to which clients encrypt CREATE
+  cells).
 
 2.5 Identity information