diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-03-16 14:58:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-03-16 14:58:43 -0400 |
| commit | 4a4f1e44af0c6aa2a27add9d1e114213a580e50d (patch) | |
| tree | a2fe4d97dd0400a651c5acd8feb6362000d31206 /src/common | |
| parent | 7505f452c865ef9ca5be35647032f93bfb392762 (diff) | |
| parent | 643c9078c98cb81d51334cf03fdac76166e57f9a (diff) | |
| download | tor-4a4f1e44af0c6aa2a27add9d1e114213a580e50d.tar.gz tor-4a4f1e44af0c6aa2a27add9d1e114213a580e50d.zip | |
Merge branch 'prop140_21643_diff_only_squashed'
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/log.c | 2 | ||||
| -rw-r--r-- | src/common/torlog.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/common/log.c b/src/common/log.c index 2878ab5349..6a5819064a 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -1177,7 +1177,7 @@ static const char *domain_list[] = { "GENERAL", "CRYPTO", "NET", "CONFIG", "FS", "PROTOCOL", "MM", "HTTP", "APP", "CONTROL", "CIRC", "REND", "BUG", "DIR", "DIRSERV", "OR", "EDGE", "ACCT", "HIST", "HANDSHAKE", "HEARTBEAT", "CHANNEL", - "SCHED", "GUARD", NULL + "SCHED", "GUARD", "CONSDIFF", NULL }; /** Return a bitmask for the log domain for which <b>domain</b> is the name, diff --git a/src/common/torlog.h b/src/common/torlog.h index ce7aff5301..6e374b1c11 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -101,8 +101,10 @@ #define LD_SCHED (1u<<22) /** Guard nodes */ #define LD_GUARD (1u<<23) +/** Generation and application of consensus diffs. */ +#define LD_CONSDIFF (1u<<24) /** Number of logging domains in the code. */ -#define N_LOGGING_DOMAINS 24 +#define N_LOGGING_DOMAINS 25 /** This log message is not safe to send to a callback-based logger * immediately. Used as a flag, not a log domain. */ |