nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.2'

Browse Source
This commit is contained in:
Nick Mathewson 2012-01-18 14:45:18 -05:00
commit 93d3a917e8
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug4012_022 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (documentation):
- Document the GiveGuardFlagTo_CVE_2011_2768_VulnerableRelays
directory authority option (introduced in Tor 0.2.2.34).

4
doc/tor.1.txt
View File

@ -1565,6 +1565,10 @@ DIRECTORY AUTHORITY SERVER OPTIONS
votes on whether to accept relays as hidden service directories.
(Default: 1)
GiveGuardFlagTo_CVE_2011_2768_VulnerableRelays **0**|**1**::
When this option is set to 0, do not vote to give the Guard flag to any
version of Tor vulnerable to CVE-2011-2769. (Default: 0)
HIDDEN SERVICE OPTIONS
----------------------