[tor-commits] [tor/master] Merge branch 'disable_memory_sentinels_squashed'

commit c0aa7ac5acd7b6f1d261a8a6eb5db2d3571e1f2f Merge: 4808540 b923c4d Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 27 16:25:25 2017 -0500

Merge branch 'disable_memory_sentinels_squashed'

changes/bug21439 | 7 ++++ configure.ac | 7 ++++ src/common/memarea.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/buffers.c | 10 +++++- src/test/test_util.c | 7 ++++ 5 files changed, 121 insertions(+), 1 deletion(-)