diff options
| author | Roger Dingledine <arma@torproject.org> | 2020-10-22 03:07:09 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2020-10-22 03:26:03 -0400 |
| commit | 00118355f5e6f94352de62f5bb10005cda6f238e (patch) | |
| tree | 66d8be81f5b17f0321a94c93d7e6b325ac035239 /doc | |
| parent | ef70f5f42a875c8d1d1280c6ef6f86d01983b6ef (diff) | |
| download | tor-00118355f5e6f94352de62f5bb10005cda6f238e.tar.gz tor-00118355f5e6f94352de62f5bb10005cda6f238e.zip | |
Turn ConsensusParams into a Linelist
Make it possible to specify multiple ConsensusParams torrc
lines.
Now directory authority operators can for example put the
main ConsensusParams config in one torrc file and then add to it
from a different torrc file.
Closes ticket 40164.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index f2a1aceb2f..3dc8c7a034 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -3014,7 +3014,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" |