summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2012-02-02 02:31:28 -0500
committerRoger Dingledine <arma@torproject.org>2012-02-02 02:31:28 -0500
commit688903e919a4c0b942893d7b507a851e57e4e452 (patch)
treebfbdd4a3ab082cf899e9bbb7f89e3c6b60d490db
parent6d595fa4cf679cf7c66673726596548758a298bc (diff)
downloadtor-688903e919a4c0b942893d7b507a851e57e4e452.tar.gz
tor-688903e919a4c0b942893d7b507a851e57e4e452.zip
Update "ClientOnly" man page entry
There isn't really any point to messing with it. Resolves ticket 5005.
-rw-r--r--changes/bug50053
-rw-r--r--doc/tor.1.txt11
2 files changed, 9 insertions, 5 deletions
diff --git a/changes/bug5005 b/changes/bug5005
new file mode 100644
index 0000000000..04d8dfe6a5
--- /dev/null
+++ b/changes/bug5005
@@ -0,0 +1,3 @@
+ o Minor bugfixes:
+ - Update "ClientOnly" man page entry to explain that there isn't
+ really any point to messing with it. Resolves ticket 5005.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 558b31b0fd..160feb0281 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -499,11 +499,12 @@ The following options are useful only for clients (that is, if
number like 60. (Default: 0)
**ClientOnly** **0**|**1**::
- If set to 1, Tor will under no circumstances run as a server or serve
- directory requests. The default is to run as a client unless ORPort is
- configured. (Usually, you don't need to set this; Tor is pretty smart at
- figuring out whether you are reliable and high-bandwidth enough to be a
- useful server.) (Default: 0)
+ If set to 1, Tor will under no circumstances run as a relay or serve
+ directory requests. This config option is mostly meaningless: we
+ added it back when we were considering having Tor clients auto-promote
+ themselves to being relays if they were stable and fast enough. The
+ current behavior is simply that Tor is a client unless ORPort or
+ DirPort are configured. (Default: 0)
**ExcludeNodes** __node__,__node__,__...__::
A list of identity fingerprints, nicknames, country codes and address