commit b6e60f26dd04fa4f2ae8020b4148147380b6d28b parent 5922087ea89659b7be71867af93f8e912204f928 Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 1 Jun 2020 09:48:56 -0400 Merge branch 'maint-0.4.3' Diffstat:
| A | changes/bug34299 | | | 3 | +++ |
| M | doc/tor.1.txt | | | 4 | ++-- |
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/changes/bug34299 b/changes/bug34299 @@ -0,0 +1,3 @@ + o Minor bugfixes (man page): + - Update the man page to reflect that MinUptimeHidServDirectoryV2 + defaults to 96 hours. Fixes bug 34299; bugfix on 0.2.6.3-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt @@ -3037,8 +3037,8 @@ on the public Tor network. unreliable. (Default: 500) [[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) [[RecommendedClientVersions]] **RecommendedClientVersions** __STRING__:: STRING is a comma-separated list of Tor versions currently believed to be