From 745f3c859afff19bb6c28eef41b5b7312a9c5c35 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 26 Mar 2008 17:25:16 +0000 Subject: r19066@catbus: nickm | 2008-03-26 13:24:15 -0400 Initialize logging before we log anything. Bugfix on 0.2.0.x-alpha. svn:r14199 --- ChangeLog | 2 ++ src/or/main.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c9d9224d3..8cd4cc062 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ Changes in version 0.2.1.1-alpha - 2008-??-?? - Fix the implementation of ClientDNSRejectInternalAddresses so that it actually works, and doesn't warn about every single reverse lookup. Fixes the other part of bug 617. Bugfix on 0.2.0.1-alpha. + - Initialize log mutex before initializing dmalloc. Otherwise, + running with dmalloc would crash. Bugfix on 0.2.0.x-alpha. o Minor features: - Allow separate log levels to be configured for different logging diff --git a/src/or/main.c b/src/or/main.c index 5630f4efe..b569efde1 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1963,12 +1963,12 @@ int tor_main(int argc, char *argv[]) { int result = 0; + init_logging(); #ifdef USE_DMALLOC int r = CRYPTO_set_mem_ex_functions(_tor_malloc, _tor_realloc, _tor_dmalloc_free); log_notice(LD_CONFIG, "Set up dmalloc; returned %d", r); #endif - init_logging(); #ifdef NT_SERVICE { int done = 0; -- cgit v1.2.3