diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-16 17:16:54 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-16 17:16:54 -0400 |
| commit | b1b6552251c87db6c4fd226add8ae8bdb9327981 (patch) | |
| tree | 0596fbac288b6770396d18e777981c687f6dd3db /src/common | |
| parent | 57b954293e3880f3b39d2f0f0f7710250e8ffc5f (diff) | |
| parent | cf399f1034cec6be2b7a98cb82a8607634e120f6 (diff) | |
| download | tor-b1b6552251c87db6c4fd226add8ae8bdb9327981.tar tor-b1b6552251c87db6c4fd226add8ae8bdb9327981.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/common/crypto.c
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/crypto.c | 1 | ||||
| -rw-r--r-- | src/common/log.c | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c index fd0a494e7..6fed55a27 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2711,4 +2711,3 @@ setup_openssl_threading(void) #endif /** @} */ - diff --git a/src/common/log.c b/src/common/log.c index 52c41fb3c..a073c827e 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -409,7 +409,7 @@ logv(int severity, log_domain_mask_t domain, const char *funcname, /** Output a message to the log. It gets logged to all logfiles that * care about messages with <b>severity</b> in <b>domain</b>. The content - * if formatted printf style + * is formatted printf style basedc on <b>format</b> and extra arguments. * */ void tor_log(int severity, log_domain_mask_t domain, const char *format, ...) @@ -425,8 +425,8 @@ tor_log(int severity, log_domain_mask_t domain, const char *format, ...) /** Output a message to the log, prefixed with a function name <b>fn</b>. */ #ifdef __GNUC__ /** GCC-based implementation of the log_fn backend, used when we have - * variadic macros. All arguments are as for log_fn, except for <b>fn</b>, which - * is the name of the calling functions. */ + * variadic macros. All arguments are as for log_fn, except for + * <b>fn</b>, which is the name of the calling functions. */ void _log_fn(int severity, log_domain_mask_t domain, const char *fn, const char *format, ...) |