aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-12-16 11:40:19 -0500
committerNick Mathewson <nickm@torproject.org>2016-12-16 11:40:19 -0500
commit990a863d7ca74c84238791607b6515813b3b5633 (patch)
treedb6a28b4668e2029c00029b674e6f08c4c8264bc /doc
parent988b0afbd6bbb97e3ca796a608a4087888f162aa (diff)
parent506bd6d47c9c003a94eae7132e83b682a53f0bc9 (diff)
downloadtor-990a863d7ca74c84238791607b6515813b3b5633.tar.gz
tor-990a863d7ca74c84238791607b6515813b3b5633.zip
Merge branch 'ticket20831_v2'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt9
1 files changed, 0 insertions, 9 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index eef74547ee..36a67ffa23 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1217,15 +1217,6 @@ The following options are useful only for clients (that is, if
Authorities, Single Onion Services, and Tor2web clients. In these cases,
the this option is ignored. (Default: 1)
-[[UseEntryGuardsAsDirGuards]] **UseEntryGuardsAsDirGuards** **0**|**1**::
- If this option is set to 1, and UseEntryGuards is also set to 1,
- we try to use our entry guards as directory
- guards, and failing that, pick more nodes to act as our directory guards.
- This helps prevent an adversary from enumerating clients. It's only
- available for clients (non-relay, non-bridge) that aren't configured to
- download any non-default directory material. It doesn't currently
- do anything when we lack a live consensus. (Default: 1)
-
[[GuardfractionFile]] **GuardfractionFile** __FILENAME__::
V3 authoritative directories only. Configures the location of the
guardfraction file which contains information about how long relays