commit d7a1e83f50f201df9ef35f48e31dd3cbdcd653e8 Merge: caf2851 6f33164 Author: Nick Mathewson nickm@torproject.org Date: Wed Feb 11 15:09:01 2015 -0500
Merge remote-tracking branch 'public/remove_freelist'
changes/remove_mempools | 5 + configure.ac | 4 - src/common/include.am | 12 +- src/common/mempool.c | 628 ----------------------------------------------- src/common/mempool.h | 65 ----- src/or/buffers.c | 247 ------------------- src/or/buffers.h | 7 +- src/or/circuitlist.c | 17 -- src/or/main.c | 19 -- src/test/test_buffers.c | 18 +- src/test/test_util.c | 67 ----- 11 files changed, 9 insertions(+), 1080 deletions(-)