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/torlog.h | |
| parent | cb7fff193e2749f241e646b155de3ee33623606e (diff) | |
| parent | b80a8bba199b9adfb9c893641ba770566fa548e1 (diff) | |
| download | tor-2527acb2dc8b71515ac0c882e3af4fc034ab1b48.tar tor-2527acb2dc8b71515ac0c882e3af4fc034ab1b48.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/common/Makefile.am
src/or/control.c
Diffstat (limited to 'src/common/torlog.h')
| -rw-r--r-- | src/common/torlog.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/common/torlog.h b/src/common/torlog.h index b8f5ea45c..4c5729ef5 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -149,7 +149,6 @@ void flush_pending_log_callbacks(void); void log_set_application_name(const char *name); void set_log_time_granularity(int granularity_msec); -/* Outputs a message to stdout */ void tor_log(int severity, log_domain_mask_t domain, const char *format, ...) CHECK_PRINTF(3,4); #define log tor_log /* hack it so we don't conflict with log() as much */ |