Merge remote-tracking branch 'andrea/bug11476'

diff --cc configure.ac
Simple merge

diff --cc src/or/circuitlist.c
Simple merge

diff --cc src/or/main.c
index 025b5192b5fd0de95b6843f5d267830e751bccc1,e5a48cf98be92533012ad226fb9f35a50b2daf71..1168f43c9d9848437f3a9e4ad176a86ac3b07c2f
--- 1/src/or/main.c
--- 2/src/or/main.c
+++ b/src/or/main.c
@@@ -2545,12 -2549,11 +2549,14 @@@ tor_free_all(int postfork
      router_free_all();
      policies_free_all();
    }
+ #ifdef ENABLE_MEMPOOLS
    free_cell_pool();
+ #endif /* ENABLE_MEMPOOLS */
    if (!postfork) {
      tor_tls_free_all();
 +#ifndef _WIN32
 +    tor_getpwnam(NULL);
 +#endif
    }
    /* stuff in main.c */
  

diff --cc src/test/test.c
Simple merge

diff --cc src/test/test_oom.c
Simple merge

diff --cc src/test/test_util.c
Simple merge