diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-23 01:23:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-23 01:23:53 -0400 |
| commit | 2527acb2dc8b71515ac0c882e3af4fc034ab1b48 (patch) | |
| tree | 48bdb4a6919a11fdb337969bb46353701895ad54 /src/common/log.c | |
| parent | cb7fff193e2749f241e646b155de3ee33623606e (diff) | |
| parent | b80a8bba199b9adfb9c893641ba770566fa548e1 (diff) | |
| download | tor-2527acb2dc8b71515ac0c882e3af4fc034ab1b48.tar.gz tor-2527acb2dc8b71515ac0c882e3af4fc034ab1b48.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/common/Makefile.am
src/or/control.c
Diffstat (limited to 'src/common/log.c')
| -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 0224e33319..abdce142ad 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 - * is formatted printf style basedc on <b>format</b> and extra arguments. + * is formatted printf-style based on <b>format</b> and extra arguments. * */ void tor_log(int severity, log_domain_mask_t domain, const char *format, ...) |