diff options
Diffstat (limited to 'doc/man/tor.1.txt')
| -rw-r--r-- | doc/man/tor.1.txt | 51 |
1 files changed, 27 insertions, 24 deletions
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index cd53d5ea26..2e4c021983 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -150,7 +150,7 @@ The following options in this section are only recognized on the + Use the **`--newpass`** option with **`--keygen`** only when you need to add, change, or remove a passphrase on an existing ed25519 - master identity key. You will be prompted for the old passphase + master identity key. You will be prompted for the old passphrase (if any), and the new passphrase (if any). + [NOTE] @@ -276,11 +276,6 @@ forward slash (/) in the configuration file and on the command line. AlternateBridgeAuthority replaces the default bridge authority, but leaves the directory authorities alone. -[[AndroidIdentityTag]] **AndroidIdentityTag** __tag__:: - When logging to Android's logging subsystem, adds a tag to the log identity - such that log entries are marked with "Tor-__tag__". Can not be changed while - tor is running. (Default: none) - [[AvoidDiskWrites]] **AvoidDiskWrites** **0**|**1**:: If non-zero, try to write to disk less frequently than we would otherwise. This is useful when running on flash memory or other media that support @@ -621,7 +616,7 @@ forward slash (/) in the configuration file and on the command line. **DirCache** fetches and serves all documents except extrainfo descriptors, **DownloadExtraInfo*** fetches extrainfo documents, and serves them if **DirCache** is on, and **UseMicrodescriptors** changes the - flavour of consensues and descriptors that is fetched and used for + flavor of consensuses and descriptors that is fetched and used for building circuits. (Default: 0) [[HardwareAccel]] **HardwareAccel** **0**|**1**:: @@ -688,7 +683,7 @@ forward slash (/) in the configuration file and on the command line. Signal-safe logs are always sent to stderr or stdout. They are also sent to a limited number of log files that are configured to log messages at error severity from the bug or general domains. They are never sent as syslogs, - android logs, control port log events, or to any API-based log + control port log events, or to any API-based log destinations. [[Log2]] **Log** __minSeverity__[-__maxSeverity__] **file** __FILENAME__:: @@ -1314,15 +1309,6 @@ The following options are useful only for clients (that is, if Every NUM seconds consider whether to build a new circuit. (Default: 30 seconds) -[[OptimisticData]] **OptimisticData** **0**|**1**|**auto**:: - When this option is set, and Tor is using an exit node that supports - the feature, it will try optimistically to send data to the exit node - without waiting for the exit node to report whether the connection - succeeded. This can save a round-trip time for protocols like HTTP - where the client talks first. If OptimisticData is set to **auto**, - Tor will look at the UseOptimisticData parameter in the networkstatus. - (Default: auto) - // These are out of order because they logically belong together [[PathBiasCircThreshold]] **PathBiasCircThreshold** __NUM__ + @@ -1833,7 +1819,7 @@ The following options control when Tor enters and leaves dormant mode: this option only with great caution: it has the potential to create spurious traffic on the network. This option should only be used if Tor is started by an affirmative user activity (like - clicking on an applcation or running a command), and not if Tor + clicking on an application or running a command), and not if Tor is launched for some other reason (for example, by a startup process, or by an application that launches itself on every login.) @@ -1877,6 +1863,9 @@ different from other Tor clients: option overrides this option; if you have configured bridges and UseBridges is 1, the Bridges are used as your entry nodes. + + + This option can appear multiple times: the values from multiple lines are + spliced together. + + + The ExcludeNodes option overrides this option: any node listed in both EntryNodes and ExcludeNodes is treated as excluded. See <<ExcludeNodes,ExcludeNodes>> for more information on how to specify nodes. @@ -1889,6 +1878,9 @@ different from other Tor clients: (Example: ExcludeNodes ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) + + + This option can appear multiple times: the values from multiple lines are + spliced together. + + + By default, this option is treated as a preference that Tor is allowed to override in order to keep working. For example, if you try to connect to a hidden service, @@ -1914,13 +1906,19 @@ different from other Tor clients: list too. See <<ExcludeNodes,ExcludeNodes>> for more information on how to specify nodes. See also the caveats on the <<ExitNodes,ExitNodes>> option below. - + + + This option can appear multiple times: the values from multiple lines are + spliced together. + + + [[ExitNodes]] **ExitNodes** __node__,__node__,__...__:: A list of identity fingerprints, country codes, and address patterns of nodes to use as exit node---that is, a node that delivers traffic for you *outside* the Tor network. See <<ExcludeNodes,ExcludeNodes>> for more information on how to specify nodes. + + + This option can appear multiple times: the values from multiple lines are + spliced together. + + + Note that if you list too few nodes here, or if you exclude too many exit nodes with ExcludeExitNodes, you can degrade functionality. For example, if none of the exits you list allows traffic on port 80 or 443, you won't @@ -1959,6 +1957,9 @@ different from other Tor clients: (Example: HSLayer2Nodes ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) + + + This option can appear multiple times: the values from multiple lines are + spliced together. + + + When this is set, the resulting hidden service paths will look like: + @@ -2015,6 +2016,9 @@ different from other Tor clients: (Example: HSLayer3Nodes ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) + + + This option can appear multiple times: the values from multiple lines are + spliced together. + + + When this is set by itself, the resulting hidden service paths will look like: + C - G - M - L3 - Rend + @@ -2062,7 +2066,10 @@ different from other Tor clients: to use for "middle" hops in your normal circuits. Normal circuits include all circuits except for direct connections to directory servers. Middle hops are all hops other than exit and entry. -+ + + + This option can appear multiple times: the values from multiple lines are + spliced together. + + + This is an **experimental** feature that is meant to be used by researchers and developers to test new features in the Tor network safely. Using it without care will strongly influence your anonymity. Other tor features may @@ -3866,7 +3873,3 @@ https://spec.torproject.org. See also **torsocks**(1) and **torify**(1). Because Tor is still under development, there may be plenty of bugs. Please report them at https://bugs.torproject.org/. - -== AUTHORS - -Roger Dingledine [arma at mit.edu], Nick Mathewson [nickm at alum.mit.edu]. |