diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-06-01 09:47:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-06-01 09:47:37 -0400 |
| commit | 688d1b3f032b5a84ad5ada23fa8831c07bd76c75 (patch) | |
| tree | 765ac6c39ded739657c0fa20210f09547d537e62 | |
| parent | 6891d1bbcb935d186150610a7abd20a2a270ce67 (diff) | |
| parent | d6186c7435d64cad9b516f4ee35db7fdbd8b91e7 (diff) | |
| download | tor-688d1b3f032b5a84ad5ada23fa8831c07bd76c75.tar.gz tor-688d1b3f032b5a84ad5ada23fa8831c07bd76c75.zip | |
Merge remote-tracking branch 'tor-github/pr/1905/head' into 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 b2014842cd..88cf47f2fe 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -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 |