diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-06-19 21:00:15 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-06-19 21:00:15 -0400 |
| commit | a046966baf7fcfb2cd51300ed0f69946f4ae1556 (patch) | |
| tree | ec680fc058395826ad961895055a0793517d7443 /doc | |
| parent | 42d6f3459053aaafbed2ab215e9e85ae5d594b5a (diff) | |
| parent | 8e5dfe42a0230722bff07ba6ededcc0d2dbd53e7 (diff) | |
| download | tor-a046966baf7fcfb2cd51300ed0f69946f4ae1556.tar.gz tor-a046966baf7fcfb2cd51300ed0f69946f4ae1556.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/config.c
src/or/or.h
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 9838c07546..7d72350eb8 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -726,14 +726,10 @@ The following options are useful only for clients (that is, if from the configured bridge authorities when feasible. It will fall back to a direct request if the authority responds with a 404. (Default: 0) -**UseBridges** **0**|**1**|**auto**:: - Make Tor fetch descriptors for each bridge listed in the "Bridge" +**UseBridges** **0**|**1**:: + When set, Tor will fetch descriptors for each bridge listed in the "Bridge" config lines, and use these relays as both entry guards and directory - 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) + guards. (Default: 0) **UseEntryGuards** **0**|**1**:: If this option is set to 1, we pick a few long-term entry servers, and try |