From 18c2beec07f598c4466dfb11134ece2aa637dcaa Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 26 Mar 2008 17:25:28 +0000 Subject: [PATCH] r19069@catbus: nickm | 2008-03-26 13:25:11 -0400 Backport fix so dmalloc can work again. svn:r14200 --- ChangeLog | 6 ++++++ src/or/main.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 88e2cebbd..c6e278cb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Changes in version 0.2.0.24-?? - 2008-??-?? + o Minor bugfixes: + - Initialize log mutex before initializing dmalloc. Otherwise, + running with dmalloc would crash. Bugfix on 0.2.0.x-alpha. + + Changes in version 0.2.0.23-rc - 2008-03-24 o Major bugfixes: - When a tunneled directory request is made to a directory server diff --git a/src/or/main.c b/src/or/main.c index 396b6f3b9..2ebd08b94 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;