diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:43:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:43:06 -0400 |
| commit | dfa6cde4d4de57476ea8381199dfbac1afc245d5 (patch) | |
| tree | 73b8f1ecac21bfad33f43c7759e5dfecf43361bc /doc | |
| parent | 5f9cdee8afd3fb0db835c19993fae476e0f00033 (diff) | |
| parent | f45261cb29504bfe39ddb96d8e7f38bb32dd37a5 (diff) | |
| download | tor-dfa6cde4d4de57476ea8381199dfbac1afc245d5.tar.gz tor-dfa6cde4d4de57476ea8381199dfbac1afc245d5.zip | |
Merge remote-tracking branch 'public/bug2649_squashed' into maint-0.2.2
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 823a6f5337..9ff19e76ab 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1180,7 +1180,7 @@ if DirPort is non-zero): **MinUptimeHidServDirectoryV2** __N__ **seconds**|**minutes**|**hours**|**days**|**weeks**:: Minimum uptime of a v2 hidden service directory to be accepted as such by - authoritative directories. (Default: 24 hours) + authoritative directories. (Default: 25 hours) **DirPort** __PORT__|**auto**:: If this option is nonzero, advertise the directory service on this port. @@ -1332,6 +1332,11 @@ DIRECTORY AUTHORITY SERVER OPTIONS that fine-grained information about nodes can be discarded when it hasn't changed for a given amount of time. (Default: 24 hours) +**VoteOnHidServDirectoriesV2** **0**|**1**:: + When this option is set in addition to **AuthoritativeDirectory**, Tor + votes on whether to accept relays as hidden service directories. + (Default: 1) + HIDDEN SERVICE OPTIONS ---------------------- |