aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-28 09:25:58 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-28 09:25:58 -0400
commit38fd3e0df06f72b3b67dfeb1d2a2c1c90761e05e (patch)
treee7dd8797aea3d4483207a0fa73c4bde5ea2780e7 /src/or
parenteee86e627b670b153bb5a0f41f9f8dfa4c378884 (diff)
downloadtor-38fd3e0df06f72b3b67dfeb1d2a2c1c90761e05e.tar.gz
tor-38fd3e0df06f72b3b67dfeb1d2a2c1c90761e05e.zip
Fix up the modules that include memarea.h (automated)
Diffstat (limited to 'src/or')
-rw-r--r--src/or/consdiff.c2
-rw-r--r--src/or/main.c2
-rw-r--r--src/or/parsecommon.h2
-rw-r--r--src/or/routerparse.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/or/consdiff.c b/src/or/consdiff.c
index 6d000997f9..88edda716e 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 1c77cdfb56..f06905b7b4 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 fc61c514a1..7fe192c2a5 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 8f5113f041..dfc298286b 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"