diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-12-21 14:22:11 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-12-21 14:22:11 -0500 |
commit | 70dd6d07bbd7c233e9f39e24b27775eae77f2363 (patch) | |
tree | dcef8cb65c5599e19ccb8b1f086eb1b792b6a8ee /src/lib | |
parent | fd58e5e498f1c86732de8d9edf6777e7822abfe7 (diff) | |
parent | 2100b35f0799276f9854dd625621deda33a9ecc3 (diff) | |
download | tor-70dd6d07bbd7c233e9f39e24b27775eae77f2363.tar.gz tor-70dd6d07bbd7c233e9f39e24b27775eae77f2363.zip |
Merge branch 'orconn-tracker_squashed'
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/log/log.c | 2 | ||||
-rw-r--r-- | src/lib/log/log.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/log/log.c b/src/lib/log/log.c index 2c25ddf1aa..d032f57add 100644 --- a/src/lib/log/log.c +++ b/src/lib/log/log.c @@ -1268,7 +1268,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", "CONSDIFF", "DOS", "PROCESS", "PT", NULL + "SCHED", "GUARD", "CONSDIFF", "DOS", "PROCESS", "PT", "BTRACK", NULL }; /** Return a bitmask for the log domain for which <b>domain</b> is the name, diff --git a/src/lib/log/log.h b/src/lib/log/log.h index c8820ee037..423e58e11b 100644 --- a/src/lib/log/log.h +++ b/src/lib/log/log.h @@ -111,8 +111,10 @@ #define LD_PROCESS (1u<<26) /** Pluggable Transports. */ #define LD_PT (1u<<27) +/** Bootstrap tracker. */ +#define LD_BTRACK (1u<<28) /** Number of logging domains in the code. */ -#define N_LOGGING_DOMAINS 28 +#define N_LOGGING_DOMAINS 29 /** This log message is not safe to send to a callback-based logger * immediately. Used as a flag, not a log domain. */ |