diff options
| author | Roger Dingledine <arma@torproject.org> | 2012-02-02 02:32:44 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2012-02-02 02:32:44 -0500 |
| commit | 92862c6d48026811c32d3e603524185778d0b4d7 (patch) | |
| tree | b0237d8b28961376e0b107bfa62ddbd26145d725 /doc | |
| parent | d487d6f6d897c82f3bf741b73abca8a7a2b49d43 (diff) | |
| parent | 688903e919a4c0b942893d7b507a851e57e4e452 (diff) | |
| download | tor-92862c6d48026811c32d3e603524185778d0b4d7.tar tor-92862c6d48026811c32d3e603524185778d0b4d7.tar.gz | |
Merge branch 'maint-0.2.2'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 16faa857f..fff9e877c 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -579,11 +579,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 |