diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-06-06 18:34:45 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-06-06 18:34:45 -0400 |
| commit | d25d08dc4dceef484206c932648023b36cf3ec7c (patch) | |
| tree | 318ce4dee3ecab1226b6c8601e25fe1123cc9042 /src | |
| parent | 8cd5a3c1865c2115d88b08041a27e2cfdd7d24d2 (diff) | |
| parent | 9eab601f10958ad75b3aef0015f32fc339609054 (diff) | |
| download | tor-d25d08dc4dceef484206c932648023b36cf3ec7c.tar.gz tor-d25d08dc4dceef484206c932648023b36cf3ec7c.zip | |
Merge remote-tracking branch 'asn2/bug3336'
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/log.c b/src/common/log.c index abdce142ad..97400623e5 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -899,7 +899,7 @@ log_level_to_string(int level) 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", NULL + "OR", "EDGE", "ACCT", "HIST", "HANDSHAKE", "HEARTBEAT", NULL }; /** Return a bitmask for the log domain for which <b>domain</b> is the name, |