Merge remote-tracking branch 'dgoulet/bug20435_030_01'

This commit is contained in:
Nick Mathewson 2016-10-24 12:24:37 -04:00
commit 410f1a438a
2 changed files with 5 additions and 1 deletions

4
changes/bug20435 Normal file
View File

@ -0,0 +1,4 @@
o Documentation (man page):
- Set the default value from 250 KBytes to 2 MBytes for
AuthDirGuardBWGuarantee in the man page which is what the code is using;
bugfix on tor-0.2.5.6-alpha; Closes ticket 20345.

View File

@ -2248,7 +2248,7 @@ on the public Tor network.
[[AuthDirGuardBWGuarantee]] **AuthDirGuardBWGuarantee** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**KBits**|**MBits**|**GBits**::
Authoritative directories only. If non-zero, this advertised capacity
or more is always sufficient to satisfy the bandwidth requirement
for the Guard flag. (Default: 250 KBytes)
for the Guard flag. (Default: 2 MBytes)
[[AuthDirPinKeys]] **AuthDirPinKeys** **0**|**1**::
Authoritative directories only. If non-zero, do not allow any relay to