diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:51:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:51:55 -0400 |
| commit | 41eef6680e814f453cc8eedff415e941429aa627 (patch) | |
| tree | 7d2ac796e36d7c5786289a6093a98c66c36dbaad /doc | |
| parent | c6ea014b5978a020ca4472345216ba29584db5a9 (diff) | |
| parent | dfa6cde4d4de57476ea8381199dfbac1afc245d5 (diff) | |
| download | tor-41eef6680e814f453cc8eedff415e941429aa627.tar.gz tor-41eef6680e814f453cc8eedff415e941429aa627.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/dirserv.c
src/or/networkstatus.c
Conflicts were related to routerinfo->node shift.
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 ed9798dd2d..4edee80cea 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1285,7 +1285,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. @@ -1437,6 +1437,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 ---------------------- |