summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-01-17 15:28:23 -0500
committerNick Mathewson <nickm@torproject.org>2012-01-18 14:44:29 -0500
commit676bba8e0c91b7885aa8a9b7f55b008ccccfe282 (patch)
tree2690b9d13a4b3e4ae30e405ec84895822fab283d
parent0126150c2d42c028c208529caf853c0d19ec4f5f (diff)
downloadtor-676bba8e0c91b7885aa8a9b7f55b008ccccfe282.tar.gz
tor-676bba8e0c91b7885aa8a9b7f55b008ccccfe282.zip
Documentation for GiveGuardFlagTo... option
-rw-r--r--changes/bug4012_0223
-rw-r--r--doc/tor.1.txt4
2 files changed, 7 insertions, 0 deletions
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
----------------------