diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-12-15 17:26:09 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-12-15 17:26:09 -0500 |
| commit | 350181529e39c5b9dcec7f1ae7edf15946fee501 (patch) | |
| tree | e6d9f2c537db3f03c0a3d9791b178dae5f1b7782 /doc | |
| parent | 616cbb31c72a95408d018fd937f1bf3adf886a9f (diff) | |
| parent | fcbd65b45cbf203b00e6752dabc7bc5b8dffdbcf (diff) | |
| download | tor-350181529e39c5b9dcec7f1ae7edf15946fee501.tar.gz tor-350181529e39c5b9dcec7f1ae7edf15946fee501.zip | |
Merge branch 'safelogging2'
Conflicts:
ChangeLog
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.in | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in index 4bcab6d04d..b5f529a3fb 100644 --- a/doc/tor.1.in +++ b/doc/tor.1.in @@ -377,11 +377,16 @@ no effect on Windows; instead you should use the --service command-line option. (Default: 0) .LP .TP -\fBSafeLogging \fR\fB0\fR|\fB1\fP -If 1, Tor replaces potentially sensitive strings in the logs -(e.g. addresses) with the string [scrubbed]. This way logs can still be +\fBSafeLogging \fR\fB0\fR|\fB1\fR|\fBrelay\fP +Tor can scrub potentially sensitive strings from log messages (e.g. addresses) +by replacing them with the string [scrubbed]. This way logs can still be useful, but they don't leave behind personally identifying information -about what sites a user might have visited. (Default: 1) +about what sites a user might have visited. + +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) .LP .TP \fBUser \fR\fIUID\fP |