From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 17 Jan 2012 20:28:23 +0000 (-0500)
Subject: Documentation for GiveGuardFlagTo... option
X-Git-Tag: tor-0.2.3.11-alpha~10^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=676bba8e0c91b7885aa8a9b7f55b008ccccfe282;p=thirdparty%2Ftor.git

Documentation for GiveGuardFlagTo... option
---

diff --git a/changes/bug4012_022 b/changes/bug4012_022
new file mode 100644
index 0000000000..f101db5535
--- /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 d91f873269..558b31b0fd 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
 ----------------------