Browse Source

Update man page for new UseBridges tristate behaviour.

anonym 14 years ago
parent
commit
40cfad1b5a
1 changed files with 7 additions and 3 deletions
  1. 7 3
      doc/tor.1.txt

+ 7 - 3
doc/tor.1.txt

@@ -708,10 +708,14 @@ The following options are useful only for clients (that is, if
     from the configured bridge authorities when feasible. It will fall back to
     from the configured bridge authorities when feasible. It will fall back to
     a direct request if the authority responds with a 404. (Default: 0)
     a direct request if the authority responds with a 404. (Default: 0)
 
 
-**UseBridges** **0**|**1**::
-    When set, Tor will fetch descriptors for each bridge listed in the "Bridge"
+**UseBridges** **0**|**1**|**auto**::
+    Make Tor fetch descriptors for each bridge listed in the "Bridge"
     config lines, and use these relays as both entry guards and directory
     config lines, and use these relays as both entry guards and directory
-    guards. (Default: 0)
+    guards. If the option is 1, bridges must be used and if no bridges are
+    configured Tor will not make any connections until a bridge is configured;
+    if it's "auto", Tor will use bridges if any are configured, otherwise it
+    will connect directly to the Tor network; if it's 0, bridges are not used
+    at all. (Defaults to auto)
 
 
 **UseEntryGuards** **0**|**1**::
 **UseEntryGuards** **0**|**1**::
     If this option is set to 1, we pick a few long-term entry servers, and try
     If this option is set to 1, we pick a few long-term entry servers, and try