summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-08-11 10:05:15 -0400
committerNick Mathewson <nickm@torproject.org>2018-08-11 10:05:15 -0400
commitc775689e96be101d2818722aa92393190ca3fc6d (patch)
treef2fd62b8ac8faef813fe62ba8d6d5eb701393fe6 /doc
parent61d5bcc1a251002d726e66461ec576d9b71cebd1 (diff)
parentdddc9a1715a2101690adb4026be81c2cc1aad671 (diff)
downloadtor-c775689e96be101d2818722aa92393190ca3fc6d.tar.gz
tor-c775689e96be101d2818722aa92393190ca3fc6d.zip
Merge remote-tracking branch 'tor-github/pr/244'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 1db8cabf86..0c010d94f2 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -754,7 +754,9 @@ GENERAL OPTIONS
If this option is set to 0, Tor will not perform any scrubbing, if it is
set to 1, all potentially sensitive strings are replaced. If it is set to
relay, all log messages generated when acting as a relay are sanitized, but
- all messages generated when acting as a client are not. (Default: 1)
+ all messages generated when acting as a client are not.
+ Note: Tor may not heed this option when logging at log levels below Notice.
+ (Default: 1)
[[User]] **User** __Username__::
On startup, setuid to this user and setgid to their primary group.