diff options
author | Nick Mathewson <nickm@torproject.org> | 2011-05-03 22:14:40 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2011-05-03 22:14:40 -0400 |
commit | b04dca448da474ceb3f9a5f1ead2efffa42c6aa6 (patch) | |
tree | 1b15a1cb60f52ddec56bbb471fa6699e1107c6c7 | |
parent | 4126de6888de54b5fc825d209ff1bfbe73cd9514 (diff) | |
download | tor-b04dca448da474ceb3f9a5f1ead2efffa42c6aa6.tar.gz tor-b04dca448da474ceb3f9a5f1ead2efffa42c6aa6.zip |
Add some missing torrc entries to tor.1.txt
Fixes bug 2379
-rw-r--r-- | changes/bug2379 | 5 | ||||
-rw-r--r-- | doc/tor.1.txt | 16 |
2 files changed, 21 insertions, 0 deletions
diff --git a/changes/bug2379 b/changes/bug2379 new file mode 100644 index 0000000000..0d378b7c12 --- /dev/null +++ b/changes/bug2379 @@ -0,0 +1,5 @@ + o Documentation: + - Add missing documentation for the authority-related torrc options + RephistTrackTime, BridgePassword, and V3AuthUseLegacyKey. Resolves + issue 2379. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 04a0537712..030f1cf32e 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1253,6 +1253,11 @@ DIRECTORY AUTHORITY SERVER OPTIONS Authoritative directories only. Like AuthDirMaxServersPerAddr, but applies to addresses shared with directory authorities. (Default: 5) +**BridgePassword** __Password__:: + If set, contains an HTTP authenticator that tells a bridge authority to + serve all requested bridge information. Used for debugging. (Default: + not set.) + **V3AuthVotingInterval** __N__ **minutes**|**hours**:: V3 authoritative directories only. Configures the server's preferred voting interval. Note that voting will __actually__ happen at an interval chosen @@ -1285,6 +1290,17 @@ DIRECTORY AUTHORITY SERVER OPTIONS bandiwdth-authority generated file storing information on relays' measured bandwidth capacities. (Default: unset.) +**V3AuthUseLegacyKey** **0**|**1**:: + If set, the directory authority will sign consensuses not only with its + own signing key, but also with a "legacy" key and certificate with a + different identity. This feature is used to migrate directory authority + keys in the event of a compromise. (Default: 0.) + +**RephistTrackTime** __N__ **seconds**|**minutes**|**hours**|**days**|**weeks**:: + Tells an authority, or other node tracking node reliability and history, + that fine-grained information about nodes can be discarded when it hasn't + changed for a given amount of time. (Default: 24 hours) + HIDDEN SERVICE OPTIONS ---------------------- |