diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-03-03 11:59:27 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-03-03 11:59:27 -0500 |
commit | 338dbdab93328e00b5e80934ce0352bebaf9ce25 (patch) | |
tree | 1b37b18f0e3e50ed0f7a05e7f211bf519cbd543c /doc | |
parent | 62482ea279d51768e5cd510d5e23808333709182 (diff) | |
parent | ccf0f77da1894a11502fa36767838f687a4494d9 (diff) | |
download | tor-338dbdab93328e00b5e80934ce0352bebaf9ce25.tar.gz tor-338dbdab93328e00b5e80934ce0352bebaf9ce25.zip |
Merge branch 'maint-0.3.3'
Diffstat (limited to 'doc')
-rw-r--r-- | doc/tor.1.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 31c43f2b46..b8ab7f0997 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -650,7 +650,8 @@ GENERAL OPTIONS + The currently recognized domains are: general, crypto, net, config, fs, protocol, mm, http, app, control, circ, rend, bug, dir, dirserv, or, edge, - acct, hist, and handshake. Domain names are case-insensitive. + + acct, hist, handshake, heartbeat, channel, sched, guard, consdiff, and dos. + Domain names are case-insensitive. + + For example, "`Log [handshake]debug [~net,~mm]info notice stdout`" sends to stdout: all handshake messages of any severity, all info-and-higher |