summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-10-07 09:13:30 +0000
committerRoger Dingledine <arma@torproject.org>2006-10-07 09:13:30 +0000
commit9fb98b269c0b8a7ac3cd2cb3228d0810c3416ffa (patch)
tree5e16818b5118d3cef4ccb24ba035879a7562dc02 /doc
parenta339449a41fb4d05f9c996df457ba03093d43502 (diff)
downloadtor-9fb98b269c0b8a7ac3cd2cb3228d0810c3416ffa.tar.gz
tor-9fb98b269c0b8a7ac3cd2cb3228d0810c3416ffa.zip
finish poking and prodding. i'm all happy now.
svn:r8633
Diffstat (limited to 'doc')
-rw-r--r--doc/TODO2
-rw-r--r--doc/control-spec.txt10
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/TODO b/doc/TODO
index 212775802f..e4267fe281 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -78,7 +78,7 @@ P - Figure out why openssl 0.9.8c "make test" fails at sha256t test.
Items for 0.1.2.x:
- Now that we're avoiding exits when picking non-exit positions,
we need to consider how to pick nodes for internal circuits. If
- we avoid exits for all positions, we skew the load balancig. If
+ we avoid exits for all positions, we skew the load balancing. If
we accept exits for all positions, we leak whether it's an internal
circuit at every step. If we accept exits only at the last hop, we
reintroduce Lasse's attacks from the Oakland paper.
diff --git a/doc/control-spec.txt b/doc/control-spec.txt
index f6e51476a0..ecf8bce862 100644
--- a/doc/control-spec.txt
+++ b/doc/control-spec.txt
@@ -92,7 +92,7 @@ $Id$
; $Digest -- The router whose identity key hashes to the given digest.
; This is the preferred way to refer to an OR.
; $Digest~Name -- The router whose identity key hashes to the given
- ; digest, but only if the routes has the given nickname.
+ ; digest, but only if the router has the given nickname.
; $Digest=Name -- The router whose identity key hashes to the given
; digest, but only if the router is Named and has the given
; nickname.
@@ -601,7 +601,7 @@ $Id$
Sometimes extensions to the controller protocol break compatibility with
older controllers. In this case, whenever possible, the extensions are
first included in Tor disabled by default, and only enabled on a given
- controller connection when the 'USEFEATURE' command is given. Once a
+ controller connection when the "USEFEATURE" command is given. Once a
"USEFEATURE" command is given, it applies to all subsequent interactions on
the same connection; to disable an enabled feature, a new controller
connection must be opened.
@@ -624,10 +624,10 @@ $Id$
VERBOSE_NAMES
- Instead of ServerID as specified elsewhere, the controller should
+ Instead of ServerID as specified above, the controller should
identify ORs by LongName in events and GETINFO results. This format is
- strictly more informative, since rather than including Nickname for
- known Named routers and Fingerprint for unknown or unNamed routers; the
+ strictly more informative: rather than including Nickname for
+ known Named routers and Fingerprint for unknown or unNamed routers, the
LongName format includes a Fingerprint, an indication of Named status,
and a Nickname (if one is known).