[tor-commits] [tor/master] Merge branch 'maint-0.4.3'

[nickm at torproject.org]

commit b6e60f26dd04fa4f2ae8020b4148147380b6d28b
Merge: 5922087ea 688d1b3f0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 1 09:48:56 2020 -0400

    Merge branch 'maint-0.4.3'

 changes/bug34299 | 3 +++
 doc/tor.1.txt    | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --cc doc/tor.1.txt
index 3dd7f5a64,88cf47f2f..7b3150e2a
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@@ -3014,54 -3007,19 +3014,54 @@@ on the public Tor network
      and their target user audience can periodically fetch the list of
      available community bridges to stay up-to-date. (Default: not set)
  
 -[[V3AuthVotingInterval]] **V3AuthVotingInterval** __N__ **minutes**|**hours**::
 -    V3 authoritative directories only. Configures the server's preferred voting
 -    interval. Note that voting will __actually__ happen at an interval chosen
 -    by consensus from all the authorities' preferred intervals. This time
 -    SHOULD divide evenly into a day. (Default: 1 hour)
 +[[ConsensusParams]] **ConsensusParams** __STRING__::
 +    STRING is a space-separated list of key=value pairs that Tor will include
 +    in the "params" line of its networkstatus vote.
  
 -[[V3AuthVoteDelay]] **V3AuthVoteDelay** __N__ **minutes**|**hours**::
 -    V3 authoritative directories only. Configures the server's preferred delay
 -    between publishing its vote and assuming it has all the votes from all the
 -    other authorities. Note that the actual time used is not the server's
 -    preferred time, but the consensus of all preferences. (Default: 5 minutes)
 +[[DirAllowPrivateAddresses]] **DirAllowPrivateAddresses** **0**|**1**::
 +    If set to 1, Tor will accept server descriptors with arbitrary "Address"
 +    elements. Otherwise, if the address is not an IP address or is a private IP
 +    address, it will reject the server descriptor. Additionally, Tor
 +    will allow exit policies for private networks to fulfill Exit flag
 +    requirements. (Default: 0)
 +
 +[[GuardfractionFile]] **GuardfractionFile** __FILENAME__::
 +    V3 authoritative directories only. Configures the location of the
 +    guardfraction file which contains information about how long relays
 +    have been guards. (Default: unset)
  
 -[[V3AuthDistDelay]] **V3AuthDistDelay** __N__ **minutes**|**hours**::
 +[[MinMeasuredBWsForAuthToIgnoreAdvertised]] **MinMeasuredBWsForAuthToIgnoreAdvertised** __N__::
 +    A total value, in abstract bandwidth units, describing how much
 +    measured total bandwidth an authority should have observed on the network
 +    before it will treat advertised bandwidths as wholly
 +    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
 +    safe for clients to use. This information is included in version 2
 +    directories. If this is not set then the value of **RecommendedVersions**
 +    is used. When this is set then **VersioningAuthoritativeDirectory** should
 +    be set too.
 +
 +[[RecommendedServerVersions]] **RecommendedServerVersions** __STRING__::
 +    STRING is a comma-separated list of Tor versions currently believed to be
 +    safe for servers to use. This information is included in version 2
 +    directories. If this is not set then the value of **RecommendedVersions**
 +    is used. When this is set then **VersioningAuthoritativeDirectory** should
 +    be set too.
 +
 +[[RecommendedVersions]] **RecommendedVersions** __STRING__::
 +    STRING is a comma-separated list of Tor versions currently believed to be
 +    safe. The list is included in each directory, and nodes which pull down the
 +    directory learn whether they need to upgrade. This option can appear
 +    multiple times: the values from multiple lines are spliced together. When
 +    this is set then **VersioningAuthoritativeDirectory** should be set too.
 +
 +[[V3AuthDistDelay]] **V3AuthDistDelay** __N__ **seconds**|**minutes**|**hours**::
      V3 authoritative directories only. Configures the server's preferred  delay
      between publishing its consensus and signature and assuming  it has all the
      signatures from all the other authorities. Note that the actual time used