commit 676bba8e0c91b7885aa8a9b7f55b008ccccfe282 Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 17 15:28:23 2012 -0500

Documentation for GiveGuardFlagTo... option --- changes/bug4012_022 | 3 +++ doc/tor.1.txt | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/changes/bug4012_022 b/changes/bug4012_022 new file mode 100644 index 0000000..f101db5 --- /dev/null +++ b/changes/bug4012_022 @@ -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). diff --git a/doc/tor.1.txt b/doc/tor.1.txt index d91f873..558b31b 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1347,6 +1347,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 ----------------------