diff options
author | Nick Mathewson <nickm@torproject.org> | 2014-05-22 16:27:29 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2014-05-22 16:27:29 -0400 |
commit | 1a73e178011d24ad2ef252dab7256d7c4fa94a64 (patch) | |
tree | 35990ad7f447fcebe8422aed4b66047f9fec2d29 /src/or/circuitlist.c | |
parent | fef65fa64341fb70df0e7b34d91d3b08a74e7aad (diff) | |
parent | 170e0df7417e78f7b689f3189e7a0b5b8dfd2722 (diff) | |
download | tor-1a73e178011d24ad2ef252dab7256d7c4fa94a64.tar.gz tor-1a73e178011d24ad2ef252dab7256d7c4fa94a64.zip |
Merge remote-tracking branch 'andrea/bug11476'
Diffstat (limited to 'src/or/circuitlist.c')
-rw-r--r-- | src/or/circuitlist.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index e5ed9c04fd..6238e08e1e 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1983,7 +1983,9 @@ circuits_handle_oom(size_t current_allocation) break; } SMARTLIST_FOREACH_END(circ); +#ifdef ENABLE_MEMPOOLS clean_cell_pool(); /* In case this helps. */ +#endif /* ENABLE_MEMPOOLS */ buf_shrink_freelists(1); /* This is necessary to actually release buffer chunks. */ |