Merge branch 'maint-0.3.3'

This commit is contained in:
Nick Mathewson 2018-03-03 11:59:27 -05:00
commit 338dbdab93
3 changed files with 10 additions and 2 deletions

4
changes/bug25378 Normal file
View File

@ -0,0 +1,4 @@
o Documentation:
- Update the documentation for "Log" to include the current list
of logging domains. Closes ticket 25378.

View File

@ -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

View File

@ -1258,7 +1258,10 @@ log_level_to_string(int level)
}
/** NULL-terminated array of names for log domains such that domain_list[dom]
* is a description of <b>dom</b>. */
* is a description of <b>dom</b>.
*
* Remember to update doc/tor.1.txt if you modify this list.
* */
static const char *domain_list[] = {
"GENERAL", "CRYPTO", "NET", "CONFIG", "FS", "PROTOCOL", "MM",
"HTTP", "APP", "CONTROL", "CIRC", "REND", "BUG", "DIR", "DIRSERV",