Documentation for GiveGuardFlagTo... option

diff --git a/changes/bug4012_022 b/changes/bug4012_022
new file mode 100644 (file)
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 d91f873269b71f6d0534bdf03e39b2c2ada0f42b..558b31b0fd97d62589c8659c7ba50d8c88b3efb6 100644 (file)
--- 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
 ----------------------