aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-08-09 11:17:27 -0400
committerNick Mathewson <nickm@torproject.org>2017-08-09 11:17:27 -0400
commitd655388a4a7c6a4415c8a48d410809591385c344 (patch)
treed95139468b7c358f974442ce08788a6eea6f77cc /doc
parentd2713b4ddc9d8a98d4b687188bcf392fd3235994 (diff)
downloadtor-d655388a4a7c6a4415c8a48d410809591385c344.tar.gz
tor-d655388a4a7c6a4415c8a48d410809591385c344.zip
Document all the arguments of PublishServerDescriptor.
Implements 15645.
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index b4a3cc5f75..11e4680d28 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1819,7 +1819,9 @@ is non-zero):
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, publish the
- appropriate descriptors to the authorities".
+ appropriate descriptors to the authorities". Other possibilities are
+ "v3", meaning "publish if running as a relay", and
+ "bridge", meaning "publish if running as a bridge".
[[ShutdownWaitLength]] **ShutdownWaitLength** __NUM__::
When we get a SIGINT and we're a server, we begin shutting down: