diff options
Diffstat (limited to 'doc/man/tor.1.txt')
| -rw-r--r-- | doc/man/tor.1.txt | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index 4b37548b07..860e1db33a 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__:: @@ -797,6 +792,17 @@ forward slash (/) in the configuration file and on the command line. field, Tor will use it for separate rate limiting for each connection from a non-relay. (Default: 0) +[[OutboundBindAddressPT]] **OutboundBindAddressPT** __IP__:: + Request that pluggable transports makes all outbound connections + originate from the IP address specified. Because outgoing connections + are handled by the pluggable transport itself, it is not possible for + Tor to enforce whether the pluggable transport honors this option. This + option overrides **OutboundBindAddress** for the same IP version. This + option may be used twice, once with an IPv4 address and once with an + IPv6 address. IPv6 addresses should be wrapped in square brackets. This + setting will be ignored for connections to the loopback addresses + (127.0.0.0/8 and ::1). + [[PidFile]] **PidFile** __FILE__:: On startup, write our PID to FILE. On clean shutdown, remove FILE. Can not be changed while tor is running. @@ -1303,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__ + @@ -1822,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.) @@ -3855,7 +3852,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]. |