diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-10 15:52:04 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-10 15:52:04 -0500 |
| commit | f1a004797e6dda71f75ddec8871c0e516eccfbbb (patch) | |
| tree | 8edcb0c614e6dfd8a64f9ec3bbcba1a3917fed99 /doc | |
| parent | cc9809c1f79344f2419195ce1b01d210da8faa67 (diff) | |
| parent | 20d493308a50d3acc10ba27ac78d4258045f8ede (diff) | |
| download | tor-f1a004797e6dda71f75ddec8871c0e516eccfbbb.tar.gz tor-f1a004797e6dda71f75ddec8871c0e516eccfbbb.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
doc/tor.1.txt
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 21298057c0..fa21f466d0 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -909,9 +909,9 @@ is non-zero): If set to a path, only the specified path will be executed. (Default: tor-fw-helper) -**PublishServerDescriptor** **0**|**1**|**v1**|**v2**|**v3**|**bridge**|**hidserv**,**...**:: +**PublishServerDescriptor** **0**|**1**|**v1**|**v2**|**v3**|**bridge**,**...**:: This option specifies which descriptors Tor will publish when acting as - a relay or hidden service. You can + a relay. You can choose multiple arguments, separated by commas. + If this option is set to 0, Tor will not publish its @@ -919,7 +919,7 @@ is non-zero): out your server, or if you're using a Tor controller that handles directory publishing for you.) Otherwise, Tor will publish its descriptors of all type(s) specified. The default is "1", - which means "if running as a server or a hidden service, publish the + which means "if running as a server, publish the appropriate descriptors to the authorities". **ShutdownWaitLength** __NUM__:: |