Fix compiling Tor with --with-dmalloc
Tor doesn't compile with ./configure --with-dmalloc set. It does compile with the following patch, but I'm not sure if that's the fix we want:
diff --git a/src/or/microdesc.c b/src/or/microdesc.c
index f56ccd9..e8f3e7c 100644
--- a/src/or/microdesc.c
+++ b/src/or/microdesc.c
@@ -53,7 +53,7 @@ HT_PROTOTYPE(microdesc_map, microdesc_t, node,
_microdesc_hash, _microdesc_eq);
HT_GENERATE(microdesc_map, microdesc_t, node,
_microdesc_hash, _microdesc_eq, 0.6,
- _tor_malloc, _tor_realloc, _tor_free);
+ malloc, realloc, free);
/** Write the body of <b>md</b> into <b>f</b>, with appropriate annotations.
* On success, return the total number of bytes written, and set
diff --git a/src/test/test.c b/src/test/test.c
index ff166ce..0cad8fc 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -61,6 +61,7 @@ double fabs(double x);
#ifdef USE_DMALLOC
#include <dmalloc.h>
#include <openssl/crypto.h>
+#include "main.h"
#endif
/** Set to true if any unit test has failed. Mostly, this is set by the macros