diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-10-26 16:39:31 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-10-26 16:39:31 -0400 |
| commit | c90535c539c60b031a3235d7e26b802865ef14c4 (patch) | |
| tree | a0ed6bf861e4c9d1686ec4253de0548139a6ec91 /doc | |
| parent | 07f2a06c6190696cf47b8e42476bb70b11083f15 (diff) | |
| parent | c1bcc1da038c5e70f2bdecc6296605d238db448c (diff) | |
| download | tor-c90535c539c60b031a3235d7e26b802865ef14c4.tar.gz tor-c90535c539c60b031a3235d7e26b802865ef14c4.zip | |
Merge branch 'maint-0.4.4'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/man/tor.1.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index 2e4c021983..5f94f414b8 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -3062,7 +3062,8 @@ on the public Tor network. [[ConsensusParams]] **ConsensusParams** __STRING__:: STRING is a space-separated list of key=value pairs that Tor will include - in the "params" line of its networkstatus vote. + in the "params" line of its networkstatus vote. This directive can be + specified multiple times so you don't have to put it all on one line. [[DirAllowPrivateAddresses]] **DirAllowPrivateAddresses** **0**|**1**:: If set to 1, Tor will accept server descriptors with arbitrary "Address" |