diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-06-13 12:42:49 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-06-13 12:42:49 -0400 |
| commit | 45424b2ca1638d5b3d147bb518c092a41028e259 (patch) | |
| tree | 867615adfef97807842059ffb2fade77c08dc60b /doc | |
| parent | 4b781e24fb920ad4cd2268b609e4b4b0bd5adb7d (diff) | |
| parent | c132427db4f207a32e4abaae0e070840e5e2b808 (diff) | |
| download | tor-45424b2ca1638d5b3d147bb518c092a41028e259.tar.gz tor-45424b2ca1638d5b3d147bb518c092a41028e259.zip | |
Merge remote-tracking branch 'linus/bug8532'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 72f75ebcdc..37d374b94c 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2032,6 +2032,10 @@ The following options are used for running a testing Tor network. the first consensus has been created. Changing this requires that **TestingTorNetwork** is set. (Default: 5 minutes) +**TestingV3AuthVotingStartOffset** __N__ **seconds**|**minutes**|**hours**:: + Directory authorities offset voting start time by this much. + Changing this requires that **TestingTorNetwork** is set. (Default: 0) + **TestingAuthDirTimeToLearnReachability** __N__ **minutes**|**hours**:: After starting as an authority, do not make claims about whether routers are Running until this much time has passed. Changing this requires |