nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 21:44:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'rransom/manpage-fixes' into maint-0.2.2

Browse Source
This commit is contained in:
Nick Mathewson 2010-10-04 12:56:05 -04:00
commit 5eb3630f1a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
doc/tor.1.txt
View File

@ -779,9 +779,9 @@ is non-zero):
**BridgeRelay** **0**|**1**:: **BridgeRelay** **0**|**1**::
Sets the relay to act as a "bridge" with respect to relaying connections Sets the relay to act as a "bridge" with respect to relaying connections
from bridge users to the Tor network. Mainly it influences how the relay from bridge users to the Tor network. It mainly causes Tor to publish a
will cache and serve directory information. Usually used in combination server descriptor to the bridge database, rather than publishing a relay
with PublishServerDescriptor. descriptor to the public directory authorities.
**ContactInfo** __email_address__:: **ContactInfo** __email_address__::
Administrative contact information for server. This line might get picked Administrative contact information for server. This line might get picked
@ -867,15 +867,15 @@ is non-zero):
multiple times to bind to multiple addresses/ports. multiple times to bind to multiple addresses/ports.
**PublishServerDescriptor** **0**|**1**|**v1**|**v2**|**v3**|**bridge**|**hidserv**,**...**:: **PublishServerDescriptor** **0**|**1**|**v1**|**v2**|**v3**|**bridge**|**hidserv**,**...**::
This option is only considered if you have an ORPort defined. You can This option specifies which descriptors Tor will publish. You can
choose multiple arguments, separated by commas. choose multiple arguments, separated by commas.
+ +
If set to 0, Tor will act as a server but it will not publish its If set to 0, Tor will not publish its
descriptor to the directory authorities. (This is useful if you're testing descriptors to any directories. (This is useful if you're testing
out your server, or if you're using a Tor controller that handles directory out your server, or if you're using a Tor controller that handles directory
publishing for you.) Otherwise, Tor will publish its descriptor to all publishing for you.) Otherwise, Tor will publish its descriptors of all
directory authorities of the type(s) specified. The value "1" is the type(s) specified. The default is "1",
default, which means "publish to the appropriate authorities". which means "publish the appropriate descriptors to the authorities".
**ShutdownWaitLength** __NUM__:: **ShutdownWaitLength** __NUM__::
When we get a SIGINT and we're a server, we begin shutting down: When we get a SIGINT and we're a server, we begin shutting down: