Commit 688d1b3f authored by Nick Mathewson's avatar Nick Mathewson
Browse files

Merge remote-tracking branch 'tor-github/pr/1905/head' into maint-0.4.3

parents 6891d1bb d6186c74
o Minor bugfixes (man page):
- Update the man page to reflect that MinUptimeHidServDirectoryV2
defaults to 96 hours. Fixes bug 34299; bugfix on
......@@ -2907,8 +2907,8 @@ on the public Tor network.
networkstatus documents rather than generating its own. (Default: 0)
[[MinUptimeHidServDirectoryV2]] **MinUptimeHidServDirectoryV2** __N__ **seconds**|**minutes**|**hours**|**days**|**weeks**::
Minimum uptime of a v2 hidden service directory to be accepted as such by
authoritative directories. (Default: 25 hours)
Minimum uptime of a relay to be accepted as a hidden service directory
by directory authorities. (Default: 96 hours)
[[RecommendedServerVersions]] **RecommendedServerVersions** __STRING__::
STRING is a comma-separated list of Tor versions currently believed to be
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment