diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-02-18 09:17:02 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-18 09:17:02 -0500 |
| commit | 96211bcf714ac739f605dc0b5b8754418080591f (patch) | |
| tree | 7c677d7993a65df2df28171dc7695a4dbab80937 /doc/tor.1.txt | |
| parent | 164eeefb9360e20d358f3a08157c5b6227d98ac7 (diff) | |
| parent | 5c34a53068f5556f5648dfe522030983f552a1fd (diff) | |
| download | tor-96211bcf714ac739f605dc0b5b8754418080591f.tar.gz tor-96211bcf714ac739f605dc0b5b8754418080591f.zip | |
Merge branch 'bug9321_rerebase'
Conflicts:
src/or/dirvote.h
src/test/include.am
src/test/test_entrynodes.c
Diffstat (limited to 'doc/tor.1.txt')
| -rw-r--r-- | doc/tor.1.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index b646a4c6e0..6480adbd93 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1114,6 +1114,17 @@ The following options are useful only for clients (that is, if 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 + have been guards. (Default: unset) + +[[UseGuardFraction]] **UseGuardFraction** **0**|**1**|**auto**:: + This torrc option specifies whether clients should use the + guardfraction information found in the consensus during path + selection. If it's set to 'auto', clients will do what the + UseGuardFraction consensus parameter tells them to do. + [[NumEntryGuards]] **NumEntryGuards** __NUM__:: If UseEntryGuards is set to 1, we will try to pick a total of NUM routers as long-term entries for our circuits. If NUM is 0, we try to learn |