Merge branch 'disable_memory_sentinels_squashed'

diff --cc configure.ac
Simple merge

diff --cc src/or/buffers.c
Simple merge

diff --cc src/test/test_util.c
Simple merge