diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-16 17:09:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-16 17:09:32 -0400 |
| commit | 57b954293e3880f3b39d2f0f0f7710250e8ffc5f (patch) | |
| tree | 06800a08323c179e6e38292ebba543165b0fb22d /src/common/torlog.h | |
| parent | 415caba967b9b470623ab29230b820b3470a91e6 (diff) | |
| parent | 6617822b841e32d6339bac13c79dd5f2b566c3c6 (diff) | |
| download | tor-57b954293e3880f3b39d2f0f0f7710250e8ffc5f.tar.gz tor-57b954293e3880f3b39d2f0f0f7710250e8ffc5f.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Trivial Conflicts in
src/common/crypto.c
src/or/main.h
src/or/or.h
Diffstat (limited to 'src/common/torlog.h')
| -rw-r--r-- | src/common/torlog.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/torlog.h b/src/common/torlog.h index add2349f1f..b8f5ea45cb 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -5,7 +5,7 @@ /* See LICENSE for licensing information */ /** - * \file log.h + * \file torlog.h * * \brief Headers for log.c **/ @@ -101,6 +101,7 @@ * immediately. Used as a flag, not a log domain. */ #define LD_NOCB (1u<<31) +/** Mask of zero or more log domains, OR'd together. */ typedef uint32_t log_domain_mask_t; /** Configures which severities are logged for each logging domain for a given |