aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-07-16 00:05:46 +0000
committerRoger Dingledine <arma@torproject.org>2008-07-16 00:05:46 +0000
commitb27b3472fa853be725420951c939eeb5f7c4dab6 (patch)
treec6caf69350f48055cb10220dfde204f9229fd077 /doc
parent9d5700711977e82165a39b88b64ee7ccb25711c8 (diff)
downloadtor-b27b3472fa853be725420951c939eeb5f7c4dab6.tar
tor-b27b3472fa853be725420951c939eeb5f7c4dab6.tar.gz
changes sitting in my trunk sandbox
svn:r15955
Diffstat (limited to 'doc')
-rw-r--r--doc/TODO2
-rw-r--r--doc/spec/proposals/138-remove-down-routers-from-consensus.txt2
-rw-r--r--doc/spec/proposals/141-jit-sd-downloads.txt6
3 files changed, 6 insertions, 4 deletions
diff --git a/doc/TODO b/doc/TODO
index 0eb9d0a47..da6c2c0dd 100644
--- 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 b19fe5ee2..a07764d53 100644
--- 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 c335f77cd..b6d27c86e 100644
--- 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