diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-12-15 12:19:08 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-12-15 12:19:08 -0500 |
| commit | 54433993c7c84dc9af878ebaf8dd1deae8c595e3 (patch) | |
| tree | 0c8f1fdbfd2e79391e5492c18b78b2cf7c3211b9 /doc | |
| parent | fec5aa75f4c50f6b307edbc7662bdb9c5a73f617 (diff) | |
| parent | 080ae03ee4c5c5e06f9f813cec4f66c5ab801a19 (diff) | |
| download | tor-54433993c7c84dc9af878ebaf8dd1deae8c595e3.tar.gz tor-54433993c7c84dc9af878ebaf8dd1deae8c595e3.zip | |
Merge branch 'feature17576-UseDefaultFallbackDirs-v2-squashed'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 041b000f09..7f8d9b6cbf 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -361,7 +361,13 @@ GENERAL OPTIONS [[FallbackDir]] **FallbackDir** __address__:__port__ orport=__port__ id=__fingerprint__ [weight=__num__]:: When we're unable to connect to any directory cache for directory info (usually because we don't know about any yet) we try a FallbackDir. - By default, the directory authorities are also FallbackDirs. + By default, the directory authorities are also FallbackDirs. Specifying a + FallbackDir replaces Tor's default hard-coded FallbackDirs (if any). + +[[UseDefaultFallbackDirs]] **UseDefaultFallbackDirs** **0**|**1**:: + Use Tor's default hard-coded FallbackDirs (if any). (When a + FallbackDir line is present, it replaces the hard-coded FallbackDirs, + regardless of the value of UseDefaultFallbackDirs.) (Default: 1) [[DirAuthority]] **DirAuthority** [__nickname__] [**flags**] __address__:__port__ __fingerprint__:: Use a nonstandard authoritative directory server at the provided address |