diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-10-24 12:24:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-10-24 12:24:37 -0400 |
| commit | 410f1a438a4f163774e5912ba9ccc6503d178b35 (patch) | |
| tree | 03bbb32c99b41b36e2f8ce09b9c99b7f13d6a4ac | |
| parent | 961c8f4838d36565ef7a54df1ed2cd692db93430 (diff) | |
| parent | 59247314d511022d9d2ec6b3b7c6d6263e72f44c (diff) | |
| download | tor-410f1a438a4f163774e5912ba9ccc6503d178b35.tar.gz tor-410f1a438a4f163774e5912ba9ccc6503d178b35.zip | |
Merge remote-tracking branch 'dgoulet/bug20435_030_01'
| -rw-r--r-- | changes/bug20435 | 4 | ||||
| -rw-r--r-- | doc/tor.1.txt | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug20435 b/changes/bug20435 new file mode 100644 index 0000000000..4fd7eb71d6 --- /dev/null +++ b/changes/bug20435 @@ -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. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 9d8b631e35..221c798257 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -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 |