aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/TODO2
-rw-r--r--doc/spec/proposals/125-bridges.txt2
-rw-r--r--doc/spec/rend-spec.txt2
3 files changed, 4 insertions, 2 deletions
diff --git a/doc/TODO b/doc/TODO
index 33c28674a3..828ed0775b 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -60,6 +60,8 @@ S/M - vidalia can launch firefox
Things we'd like to do in 0.2.0.x:
- document the "3/4 and 7/8" business in the clients fetching consensus
documents timeline. then document the bridge user download timeline.
+ - config option __ControllerLimit that hangs up if there are a limit
+ of controller connections already.
- See also Flyspray tasks.
- See also all items marked XXXX020 and DOCDOC in the code
- https://www.torproject.org/eff/legal-faq.html#License doesn't mention
diff --git a/doc/spec/proposals/125-bridges.txt b/doc/spec/proposals/125-bridges.txt
index a0d51f3fe3..e3cb1d4ed7 100644
--- a/doc/spec/proposals/125-bridges.txt
+++ b/doc/spec/proposals/125-bridges.txt
@@ -1,4 +1,4 @@
-Filename: xxx-bridges.txt
+Filename: 125-bridges.txt
Title: Behavior for bridge users, bridge relays, and bridge authorities
Version: $Revision$
Last-Modified: $Date$
diff --git a/doc/spec/rend-spec.txt b/doc/spec/rend-spec.txt
index 3dd85f235d..dd7a499388 100644
--- a/doc/spec/rend-spec.txt
+++ b/doc/spec/rend-spec.txt
@@ -404,7 +404,7 @@ $Id$
1.3. Bob's OP establishes his introduction points.
The OP establishes a new introduction circuit to each introduction
- point. These circuits MUST NOT be used for anything but rendezvous
+ point. These circuits MUST NOT be used for anything but hidden service
introduction. To establish the introduction, Bob sends a
RELAY_ESTABLISH_INTRO cell, containing: