From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 22 May 2014 20:27:29 +0000 (-0400)
Subject: Merge remote-tracking branch 'andrea/bug11476'
X-Git-Tag: tor-0.2.5.5-alpha~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a73e178011d24ad2ef252dab7256d7c4fa94a64;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'andrea/bug11476'
---

1a73e178011d24ad2ef252dab7256d7c4fa94a64
diff --cc src/or/main.c
index 025b5192b5,e5a48cf98b..1168f43c9d
--- a/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 */