From 532f70a8076de227cd7f31e7bb3474f3b90d6b58 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sun, 10 Nov 2013 12:21:23 -0500 Subject: Change documentation DirServer->DirAuthority We renamed the option, but we didn't actually fix it in the log messages or the docs. This patch does that. For #10124. Patch by sqrt2. --- doc/tor.1.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/tor.1.txt b/doc/tor.1.txt index b9ee29614..938ed2c78 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -622,7 +622,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. + @@ -2007,7 +2007,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 -- cgit v1.2.3