diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-06-05 11:20:45 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-06-05 11:20:45 -0400 |
| commit | beec881f92d25b4e85aa30be341d30fce54b2e50 (patch) | |
| tree | 3b9d0772eb1a6ead1f7f825775f082540026c149 /doc | |
| parent | 4d7ac69f05ea80e0a79efe2af64dfe66d788e8df (diff) | |
| parent | c03cfc05468077d5db52ec660a2e7e3fb086a751 (diff) | |
| download | tor-beec881f92d25b4e85aa30be341d30fce54b2e50.tar tor-beec881f92d25b4e85aa30be341d30fce54b2e50.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5785b3805..72f75ebcd 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2023,12 +2023,12 @@ The following options are used for running a testing Tor network. **TestingTorNetwork** is set. (Default: 30 minutes) **TestingV3AuthInitialVoteDelay** __N__ **minutes**|**hours**:: - Like TestingV3AuthInitialVoteDelay, but for initial voting interval before + Like V3AuthVoteDelay, but for initial voting interval before the first consensus has been created. Changing this requires that **TestingTorNetwork** is set. (Default: 5 minutes) **TestingV3AuthInitialDistDelay** __N__ **minutes**|**hours**:: - Like TestingV3AuthInitialDistDelay, but for initial voting interval before + Like V3AuthDistDelay, but for initial voting interval before the first consensus has been created. Changing this requires that **TestingTorNetwork** is set. (Default: 5 minutes) |