diff options
author | Alexander Færøy <ahf@torproject.org> | 2020-07-14 16:07:36 +0000 |
---|---|---|
committer | Alexander Færøy <ahf@torproject.org> | 2020-07-14 16:07:36 +0000 |
commit | aba0ff4cb587e8771f360b516e2029aa6efcd547 (patch) | |
tree | 1e2ffd58c2a8e47c85a49a20c657182da37ebfd7 /src/app/config | |
parent | c53c0e82b4d2ff1df895f16f37a06d1c391fdaeb (diff) | |
parent | 456be93956d1f0acfa50dc3bc19ac6e2b9d2d77a (diff) | |
download | tor-aba0ff4cb587e8771f360b516e2029aa6efcd547.tar.gz tor-aba0ff4cb587e8771f360b516e2029aa6efcd547.zip |
Merge remote-tracking branch 'tor-gitlab/merge-requests/48'
Diffstat (limited to 'src/app/config')
-rw-r--r-- | src/app/config/config.c | 2 | ||||
-rw-r--r-- | src/app/config/testnet.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 10f09d7d98..f4172bd84e 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -27,7 +27,7 @@ * <li>The option_vars_ array below in this module, which configures * the names of the torrc options, their types, their multiplicities, * and their mappings to fields in or_options_t. - * <li>The manual in doc/tor.1.txt, to document what the new option + * <li>The manual in doc/man/tor.1.txt, to document what the new option * is, and how it works. * </ul> * diff --git a/src/app/config/testnet.inc b/src/app/config/testnet.inc index 605943d80b..00b307782b 100644 --- a/src/app/config/testnet.inc +++ b/src/app/config/testnet.inc @@ -1,5 +1,5 @@ // When modifying, don't forget to update the defaults -// for 'TestingTorNetwork' in 'doc/tor.1.txt' +// for 'TestingTorNetwork' in 'doc/man/tor.1.txt' { "DirAllowPrivateAddresses", "1" }, { "EnforceDistinctSubnets", "0" }, { "AuthDirMaxServersPerAddr", "0" }, |