commit 77bb85ba873425b6c7b48d4c93bde1f434a37314 Author: Roger Dingledine arma@torproject.org Date: Wed Aug 9 15:07:49 2017 -0400

fix description of PublishServerDescriptor

the values of "v3" and "bridge" have to do with *where* you publish to, not whether you publish. --- doc/tor.1.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 11e4680d2..2e11534a6 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1815,13 +1815,13 @@ is non-zero): + If this option is set to 0, Tor will not publish its 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 - 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". Other possibilities are - "v3", meaning "publish if running as a relay", and - "bridge", meaning "publish if running as a bridge". + 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 relay or bridge, publish descriptors to the + appropriate authorities". Other possibilities are "v3", meaning + "publish as if you're a relay", and "bridge", meaning "publish as + if you're a bridge".

[[ShutdownWaitLength]] **ShutdownWaitLength** __NUM__:: When we get a SIGINT and we're a server, we begin shutting down: