From 676bba8e0c91b7885aa8a9b7f55b008ccccfe282 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 17 Jan 2012 15:28:23 -0500
Subject: Documentation for GiveGuardFlagTo... option

---
 doc/tor.1.txt | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'doc')

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
 ----------------------
 
-- 
cgit v1.2.3-54-g00ecf