summaryrefslogtreecommitdiff
path: root/doc/tor.1.txt
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-09 13:37:56 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-09 13:37:56 -0400
commit09d7af7789d1b5cd1fdad59fc7eafa7748b4bb57 (patch)
tree09125cf5f4fb3e20709d6c39f78e419791db67d7 /doc/tor.1.txt
parent0b3166fffa0e5e19c63fd95538f87d634444d28c (diff)
parentcd42ae71850985ed8dd34ae73dc6265a643fcb13 (diff)
downloadtor-09d7af7789d1b5cd1fdad59fc7eafa7748b4bb57.tar.gz
tor-09d7af7789d1b5cd1fdad59fc7eafa7748b4bb57.zip
Merge remote-tracking branch 'public/bug3022_v2' into maint-0.2.2
Diffstat (limited to 'doc/tor.1.txt')
-rw-r--r--doc/tor.1.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 030f1cf32e..00d5066d0a 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1171,6 +1171,12 @@ if DirPort is non-zero):
Set an entrance policy for this server, to limit who can connect to the
directory ports. The policies have the same form as exit policies above.
+**FetchV2Networkstatus** **0**|**1**::
+ If set, we try to fetch the (obsolete, unused) version 2 network status
+ consensus documents from the directory authorities. No currently
+ supported Tor version uses them. (Default: 0.)
+
+
DIRECTORY AUTHORITY SERVER OPTIONS
----------------------------------