diff options
| author | Alexander Færøy <ahf@torproject.org> | 2020-10-13 13:50:14 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2020-10-13 13:50:14 +0000 |
| commit | 78aa037c4191edf4231502d5584f9e1ed4834bca (patch) | |
| tree | baf5f81e64b5f4980c12725356b9c770fe3bfbc4 /doc | |
| parent | 5d23881770161cc9aa50fa3f2595061057d1bcca (diff) | |
| parent | 458897e3c524db92caa579d35c9d3494c7bfd733 (diff) | |
| download | tor-78aa037c4191edf4231502d5584f9e1ed4834bca.tar.gz tor-78aa037c4191edf4231502d5584f9e1ed4834bca.zip | |
Merge remote-tracking branch 'tor-gitlab/mr/161'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/man/tor.1.txt | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index f7aba268e5..ac4582a92b 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -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 @@ -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__:: |