diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-11-10 12:24:12 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-11-10 12:24:12 -0500 |
| commit | fc5a881bd3bd635be897fafdd4f9a30d5b2bed14 (patch) | |
| tree | 257131c7db975442223002903a4fde97f6c762d6 /doc | |
| parent | e30fb0a160c083ceaf1bf215089ab5e1b0924f34 (diff) | |
| parent | 8bfa596c152603e376b8f096a3367c1d785d6763 (diff) | |
| download | tor-fc5a881bd3bd635be897fafdd4f9a30d5b2bed14.tar tor-fc5a881bd3bd635be897fafdd4f9a30d5b2bed14.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index c2afed85e..34a9f24eb 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -656,7 +656,7 @@ The following options are useful only for clients (that is, if [[Bridge]] **Bridge** [__transport__] __IP__:__ORPort__ [__fingerprint__]:: When set along with UseBridges, instructs Tor to use the relay at "IP:ORPort" as a "bridge" relaying into the Tor network. If "fingerprint" - is provided (using the same format as for DirServer), we will verify that + is provided (using the same format as for DirAuthority), we will verify that the relay running at that location has the right fingerprint. We also use fingerprint to look up the bridge descriptor at the bridge authority, if it's provided and if UpdateBridgesFromAuthority is set too. + @@ -2043,7 +2043,8 @@ The following options are used for running a testing Tor network. [[TestingTorNetwork]] **TestingTorNetwork** **0**|**1**:: If set to 1, Tor adjusts default values of the configuration options below, so that it is easier to set up a testing Tor network. May only be set if - non-default set of DirServers is set. Cannot be unset while Tor is running. + non-default set of DirAuthorities is set. Cannot be unset while Tor is + running. (Default: 0) + ServerDNSAllowBrokenConfig 1 |