commit b8554dd8804fc6e5e86962edd655bc80e32f9a75 Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 9 08:44:16 2018 -0400

Make Tor compile with --disable-memory-sentinels again --- src/lib/memarea/.may_include | 1 + src/lib/memarea/memarea.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/memarea/.may_include b/src/lib/memarea/.may_include index c55722284..814652a93 100644 --- a/src/lib/memarea/.may_include +++ b/src/lib/memarea/.may_include @@ -1,6 +1,7 @@ orconfig.h lib/arch/*.h lib/cc/*.h +lib/container/*.h lib/log/*.h lib/malloc/*.h lib/memarea/*.h diff --git a/src/lib/memarea/memarea.c b/src/lib/memarea/memarea.c index 2d510a51a..9d494ab2d 100644 --- a/src/lib/memarea/memarea.c +++ b/src/lib/memarea/memarea.c @@ -14,8 +14,9 @@ #include <stdlib.h> #include <string.h>

-#include "lib/cc/torint.h" #include "lib/arch/bytes.h" +#include "lib/cc/torint.h" +#include "lib/container/smartlist.h" #include "lib/log/torlog.h" #include "lib/log/util_bug.h" #include "lib/malloc/util_malloc.h"