Merge branch 'maint-0.2.2'

This commit is contained in:
Roger Dingledine 2012-02-02 02:32:44 -05:00
commit 92862c6d48
2 changed files with 9 additions and 5 deletions

3
changes/bug5005 Normal file
View File

@ -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.

View File

@ -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