torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.2'

Browse Source 
Conflicts:
	doc/tor.1.txt
This commit is contained in:
Nick Mathewson
2011-02-10 15:52:04 -05:00
parent cc9809c1f7 20d493308a
commit f1a004797e
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/tor.1.txt
+3 -3
View File
@@ -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__::