summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorteor (Tim Wilson-Brown) <teor2345@gmail.com>2015-11-25 08:53:29 +1100
committerNick Mathewson <nickm@torproject.org>2015-12-15 12:19:01 -0500
commit080ae03ee4c5c5e06f9f813cec4f66c5ab801a19 (patch)
tree0c9ad3c4fe06d27b11af4730180abe54244fe9fd /doc
parent6cdd024c94ce9d2ba73cb393ccc84c6274c26d85 (diff)
downloadtor-080ae03ee4c5c5e06f9f813cec4f66c5ab801a19.tar.gz
tor-080ae03ee4c5c5e06f9f813cec4f66c5ab801a19.zip
Add UseDefaultFallbackDirs for hard-coded directory mirrors
UseDefaultFallbackDirs enables any hard-coded fallback directory mirrors. Default is 1, set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor".
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index aba0c1c396..5dcfb45f74 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -356,7 +356,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