[tor-commits] [tor/master] Fix up the modules that include memarea.h (automated)

[nickm at torproject.org]

commit 38fd3e0df06f72b3b67dfeb1d2a2c1c90761e05e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 28 09:25:58 2018 -0400

    Fix up the modules that include memarea.h (automated)
---
 src/common/storagedir.c  | 2 +-
 src/or/consdiff.c        | 2 +-
 src/or/main.c            | 2 +-
 src/or/parsecommon.h     | 2 +-
 src/or/routerparse.c     | 2 +-
 src/test/fuzz/fuzz_vrs.c | 2 +-
 src/test/test.c          | 2 +-
 src/test/test_consdiff.c | 2 +-
 src/test/test_dir.c      | 2 +-
 src/test/test_options.c  | 2 +-
 src/test/test_util.c     | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/common/storagedir.c b/src/common/storagedir.c
index 53b785bcf..7642fbbb8 100644
--- a/src/common/storagedir.c
+++ b/src/common/storagedir.c
@@ -4,7 +4,7 @@
 #include "lib/container/smartlist.h"
 #include "common/compat.h"
 #include "lib/encoding/confline.h"
-#include "common/memarea.h"
+#include "lib/memarea/memarea.h"
 #include "lib/sandbox/sandbox.h"
 #include "common/storagedir.h"
 #include "lib/log/torlog.h"
diff --git a/src/or/consdiff.c b/src/or/consdiff.c
index 6d000997f..88edda716 100644
--- a/src/or/consdiff.c
+++ b/src/or/consdiff.c
@@ -40,7 +40,7 @@
 
 #include "or/or.h"
 #include "or/consdiff.h"
-#include "common/memarea.h"
+#include "lib/memarea/memarea.h"
 #include "or/routerparse.h"
 
 static const char* ns_diff_version = "network-status-diff-version 1";
diff --git a/src/or/main.c b/src/or/main.c
index 1c77cdfb5..f06905b7b 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -110,7 +110,7 @@
 #include "or/tor_api_internal.h"
 #include "common/util_process.h"
 #include "or/ext_orport.h"
-#include "common/memarea.h"
+#include "lib/memarea/memarea.h"
 #include "lib/sandbox/sandbox.h"
 
 #include <event2/event.h>
diff --git a/src/or/parsecommon.h b/src/or/parsecommon.h
index fc61c514a..7fe192c2a 100644
--- a/src/or/parsecommon.h
+++ b/src/or/parsecommon.h
@@ -10,7 +10,7 @@
 #define TOR_PARSECOMMON_H
 
 #include "lib/crypt_ops/crypto.h"
-#include "common/memarea.h"
+#include "lib/memarea/memarea.h"
 
 struct smartlist_t;
 
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 8f5113f04..dfc298286 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -62,7 +62,7 @@
 #include "or/dirauth/shared_random.h"
 #include "or/dirserv.h"
 #include "or/entrynodes.h"
-#include "common/memarea.h"
+#include "lib/memarea/memarea.h"
 #include "or/microdesc.h"
 #include "or/networkstatus.h"
 #include "or/parsecommon.h"
diff --git a/src/test/fuzz/fuzz_vrs.c b/src/test/fuzz/fuzz_vrs.c
index 8126f8e48..0713f99c3 100644
--- a/src/test/fuzz/fuzz_vrs.c
+++ b/src/test/fuzz/fuzz_vrs.c
@@ -4,7 +4,7 @@
 #define NETWORKSTATUS_PRIVATE
 #include "or/or.h"
 #include "or/routerparse.h"
-#include "common/memarea.h"
+#include "lib/memarea/memarea.h"
 #include "or/microdesc.h"
 #include "or/networkstatus.h"
 
diff --git a/src/test/test.c b/src/test/test.c
index 1a3f4f8eb..8ce756492 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -51,7 +51,7 @@ double fabs(double x);
 #include "or/rendcache.h"
 #include "test/test.h"
 #include "or/main.h"
-#include "common/memarea.h"
+#include "lib/memarea/memarea.h"
 #include "or/onion.h"
 #include "or/onion_ntor.h"
 #include "or/onion_fast.h"
diff --git a/src/test/test_consdiff.c b/src/test/test_consdiff.c
index e293866f3..38947a225 100644
--- a/src/test/test_consdiff.c
+++ b/src/test/test_consdiff.c
@@ -8,7 +8,7 @@
 #include "test/test.h"
 
 #include "or/consdiff.h"
-#include "common/memarea.h"
+#include "lib/memarea/memarea.h"
 #include "test/log_test_helpers.h"
 
 #define tt_str_eq_line(a,b) \
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index f98afcaa2..2643161fc 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -30,7 +30,7 @@
 #include "or/entrynodes.h"
 #include "or/fp_pair.h"
 #include "or/hibernate.h"
-#include "common/memarea.h"
+#include "lib/memarea/memarea.h"
 #include "or/networkstatus.h"
 #include "or/router.h"
 #include "or/routerkeys.h"
diff --git a/src/test/test_options.c b/src/test/test_options.c
index 6f31d9767..5860bef7a 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -16,7 +16,7 @@
 #include "test/log_test_helpers.h"
 
 #include "lib/sandbox/sandbox.h"
-#include "common/memarea.h"
+#include "lib/memarea/memarea.h"
 #include "or/policies.h"
 #include "test/test_helpers.h"
 
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 0c2febd46..f1c2812f1 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -16,7 +16,7 @@
 #include "or/control.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "test/test.h"
-#include "common/memarea.h"
+#include "lib/memarea/memarea.h"
 #include "common/util_process.h"
 #include "test/log_test_helpers.h"
 #include "lib/compress/compress_zstd.h"