[tor-commits] [tor/master] Merge remote-tracking branch 'andrea/bug11476'

[nickm at torproject.org]

commit 1a73e178011d24ad2ef252dab7256d7c4fa94a64
Merge: fef65fa 170e0df
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 22 16:27:29 2014 -0400

    Merge remote-tracking branch 'andrea/bug11476'

 changes/bug11476           |    5 +++++
 configure.ac               |   13 +++++++++++--
 src/common/include.am      |   16 ++++++++++++----
 src/or/circuitlist.c       |    2 ++
 src/or/main.c              |    6 ++++++
 src/or/relay.c             |   31 +++++++++++++++++++++++++++----
 src/or/relay.h             |    2 ++
 src/test/test.c            |    2 ++
 src/test/test_cell_queue.c |   10 ++++++++++
 src/test/test_circuitmux.c |    4 ++++
 src/test/test_oom.c        |   13 +++++++++++++
 src/test/test_util.c       |    8 ++++++++
 12 files changed, 102 insertions(+), 10 deletions(-)

diff --cc src/or/main.c
index 025b519,e5a48cf..1168f43
--- 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 */