diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-12 09:18:52 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-12 09:18:52 -0500 |
| commit | 6c5a73f87abc6a8791e41e9d7f3728d67145001c (patch) | |
| tree | 4e60b224a45bd5ee372a96b6b9e2fd78802d8b31 /doc | |
| parent | 21ee765df0a2f20b6de21af0f4e10dc80d6fd68b (diff) | |
| parent | cbc465a3d1496d43c9bf28cfaf20d7409a2070b7 (diff) | |
| download | tor-6c5a73f87abc6a8791e41e9d7f3728d67145001c.tar.gz tor-6c5a73f87abc6a8791e41e9d7f3728d67145001c.zip | |
Merge remote-tracking branch 'ahf-oniongit/bugs/24362'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 1814b8292a..b2218e33cc 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -727,6 +727,11 @@ GENERAL OPTIONS log entries are marked with "Tor-__tag__". Can not be changed while tor is running. (Default: none) +[[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) + [[SafeLogging]] **SafeLogging** **0**|**1**|**relay**:: Tor can scrub potentially sensitive strings from log messages (e.g. addresses) by replacing them with the string [scrubbed]. This way logs can |