summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-08-17 20:44:51 +0000
committerRoger Dingledine <arma@torproject.org>2007-08-17 20:44:51 +0000
commitcb7f4504e4dfcf04767f73c7014dea065d731655 (patch)
treedb29f97f1bca13d7287182455e71e3825584ee8e
parentb34ed73706c03671bee2cb8f1bb86b004ea2015e (diff)
downloadtor-cb7f4504e4dfcf04767f73c7014dea065d731655.tar.gz
tor-cb7f4504e4dfcf04767f73c7014dea065d731655.zip
cleanups on r11138. it's ready to backport now, i think (i hope).
svn:r11154
-rw-r--r--doc/spec/control-spec.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/spec/control-spec.txt b/doc/spec/control-spec.txt
index e102a552bf..edd6833615 100644
--- a/doc/spec/control-spec.txt
+++ b/doc/spec/control-spec.txt
@@ -766,9 +766,9 @@ $Id$
data on any InfoLine.
PIVERSION is there in case we drastically change the syntax one day. For
- now it should always be "1", for the controller protocol. Controllers MAY
- provide a list of the protocol versions they support; Tor MAY select a
- version that the controller does not support.
+ now it should always be "1". Controllers MAY provide a list of the
+ protocolinfo versions they support; Tor MAY select a version that the
+ controller does not support.
AuthMethod is used to specify one or more control authentication
methods that Tor currently accepts.
@@ -1447,7 +1447,7 @@ $Id$
The 'version 0' control protocol was replaced in Tor 0.1.1.x. Support was
removed in Tor 0.2.0.x. Every non-obsolete version of Tor now supports the
- version 1 control protocol.
+ version 1 control protocol.
For backward compatibility with the "version 0" control protocol,
Tor used to check whether the third octet of the first command is zero.