aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-10-16 11:20:43 -0400
committerNick Mathewson <nickm@torproject.org>2013-10-16 11:20:43 -0400
commit17d368281ad374908fb019e29f3f012659be010c (patch)
treea34ee421c26c1003f93b7928817699cc622c1933 /doc
parent1129362bd7208413d93f7f8e1b4317883a5c7910 (diff)
parentfab8fd2c18491440b37b71e140e23e6091bbbe32 (diff)
downloadtor-17d368281ad374908fb019e29f3f012659be010c.tar
tor-17d368281ad374908fb019e29f3f012659be010c.tar.gz
Merge remote-tracking branch 'linus/bug9206_option'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 5fb256ac7..215ea0cf4 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2145,6 +2145,15 @@ The following options are used for running a testing Tor network.
Try this often to download a v3 authority certificate before giving up.
Changing this requires that **TestingTorNetwork** is set. (Default: 8)
+**TestingDirAuthVoteGuard** __node__,__node__,__...__::
+ A list of identity fingerprints, nicknames, country codes and
+ address patterns of nodes to vote Guard for regardless of their
+ uptime and bandwidth. See the **ExcludeNodes** option for more
+ information on how to specify nodes.
+ +
+ In order for this option to have any effect, **TestingTorNetwork**
+ has to be set.
+
SIGNALS
-------