diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-06-01 09:48:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-06-01 09:50:04 -0400 |
| commit | b6e60f26dd04fa4f2ae8020b4148147380b6d28b (patch) | |
| tree | d1074005297245f0bcd3fa03380664047a538209 | |
| parent | 5922087ea89659b7be71867af93f8e912204f928 (diff) | |
| parent | 688d1b3f032b5a84ad5ada23fa8831c07bd76c75 (diff) | |
| download | tor-b6e60f26dd04fa4f2ae8020b4148147380b6d28b.tar.gz tor-b6e60f26dd04fa4f2ae8020b4148147380b6d28b.zip | |
Merge branch 'maint-0.4.3'
| -rw-r--r-- | changes/bug34299 | 3 | ||||
| -rw-r--r-- | doc/tor.1.txt | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/changes/bug34299 b/changes/bug34299 new file mode 100644 index 0000000000..464cf0d18a --- /dev/null +++ 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 index 3dd7f5a64a..7b3150e2a4 100644 --- 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 |