summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-21 13:12:23 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-21 13:20:07 -0400
commit3305ae50442aaed13a9e15c392439c348e6182be (patch)
tree90f87873c4075556ca853cc5e929ff8188627310 /src/or
parent5b8f4769dc93bf3c934dd6b2fdfec2977b8bee55 (diff)
downloadtor-3305ae50442aaed13a9e15c392439c348e6182be.tar.gz
tor-3305ae50442aaed13a9e15c392439c348e6182be.zip
Rectify include paths (automated).
You have no idea how glad I am that this is automated.
Diffstat (limited to 'src/or')
-rw-r--r--src/or/addressmap.h2
-rw-r--r--src/or/circuitlist.h2
-rw-r--r--src/or/circuitmux.h2
-rw-r--r--src/or/config.h2
-rw-r--r--src/or/connection_edge.h2
-rw-r--r--src/or/dirauth/dircollate.h2
-rw-r--r--src/or/dirserv.h2
-rw-r--r--src/or/geoip.h2
-rw-r--r--src/or/hibernate.h2
-rw-r--r--src/or/keypin.h2
-rw-r--r--src/or/networkstatus.h2
-rw-r--r--src/or/router.h2
-rw-r--r--src/or/routerlist.h2
-rw-r--r--src/or/scheduler.h2
-rw-r--r--src/or/status.h2
15 files changed, 15 insertions, 15 deletions
diff --git a/src/or/addressmap.h b/src/or/addressmap.h
index 0d53e77772..b0db5c8b4e 100644
--- a/src/or/addressmap.h
+++ b/src/or/addressmap.h
@@ -7,7 +7,7 @@
#ifndef TOR_ADDRESSMAP_H
#define TOR_ADDRESSMAP_H
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
void addressmap_init(void);
void addressmap_clear_excluded_trackexithosts(const or_options_t *options);
diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h
index 9f80c3efde..8b41424eeb 100644
--- a/src/or/circuitlist.h
+++ b/src/or/circuitlist.h
@@ -12,7 +12,7 @@
#ifndef TOR_CIRCUITLIST_H
#define TOR_CIRCUITLIST_H
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
#include "or/hs_ident.h"
/** Convert a circuit_t* to a pointer to the enclosing or_circuit_t. Assert
diff --git a/src/or/circuitmux.h b/src/or/circuitmux.h
index 68bcbf6e75..e94cc354c7 100644
--- a/src/or/circuitmux.h
+++ b/src/or/circuitmux.h
@@ -10,7 +10,7 @@
#define TOR_CIRCUITMUX_H
#include "or/or.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
typedef struct circuitmux_policy_s circuitmux_policy_t;
typedef struct circuitmux_policy_data_s circuitmux_policy_data_t;
diff --git a/src/or/config.h b/src/or/config.h
index a94cd77538..dc3322e6b4 100644
--- a/src/or/config.h
+++ b/src/or/config.h
@@ -12,7 +12,7 @@
#ifndef TOR_CONFIG_H
#define TOR_CONFIG_H
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(DARWIN)
#define KERNEL_MAY_SUPPORT_IPFW
diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h
index 9d480aec2e..d6774668d8 100644
--- a/src/or/connection_edge.h
+++ b/src/or/connection_edge.h
@@ -12,7 +12,7 @@
#ifndef TOR_CONNECTION_EDGE_H
#define TOR_CONNECTION_EDGE_H
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
edge_connection_t *TO_EDGE_CONN(connection_t *);
entry_connection_t *TO_ENTRY_CONN(connection_t *);
diff --git a/src/or/dirauth/dircollate.h b/src/or/dirauth/dircollate.h
index 1d403b20f2..aae7829786 100644
--- a/src/or/dirauth/dircollate.h
+++ b/src/or/dirauth/dircollate.h
@@ -12,7 +12,7 @@
#ifndef TOR_DIRCOLLATE_H
#define TOR_DIRCOLLATE_H
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
#include "or/or.h"
typedef struct dircollator_s dircollator_t;
diff --git a/src/or/dirserv.h b/src/or/dirserv.h
index a8d5ac616b..757eba7ba2 100644
--- a/src/or/dirserv.h
+++ b/src/or/dirserv.h
@@ -12,7 +12,7 @@
#ifndef TOR_DIRSERV_H
#define TOR_DIRSERV_H
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
/** What fraction (1 over this number) of the relay ID space do we
* (as a directory authority) launch connections to at each reachability
diff --git a/src/or/geoip.h b/src/or/geoip.h
index 8a5dd701e0..3a991038af 100644
--- a/src/or/geoip.h
+++ b/src/or/geoip.h
@@ -12,7 +12,7 @@
#ifndef TOR_GEOIP_H
#define TOR_GEOIP_H
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
#include "or/dos.h"
#ifdef GEOIP_PRIVATE
diff --git a/src/or/hibernate.h b/src/or/hibernate.h
index cdef33543a..bfd8571cd6 100644
--- a/src/or/hibernate.h
+++ b/src/or/hibernate.h
@@ -12,7 +12,7 @@
#ifndef TOR_HIBERNATE_H
#define TOR_HIBERNATE_H
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
int accounting_parse_options(const or_options_t *options, int validate_only);
MOCK_DECL(int, accounting_is_enabled, (const or_options_t *options));
diff --git a/src/or/keypin.h b/src/or/keypin.h
index b8b9ff5972..73a76be563 100644
--- a/src/or/keypin.h
+++ b/src/or/keypin.h
@@ -4,7 +4,7 @@
#ifndef TOR_KEYPIN_H
#define TOR_KEYPIN_H
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
int keypin_check_and_add(const uint8_t *rsa_id_digest,
const uint8_t *ed25519_id_key,
diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h
index 97b90dab61..cc6badf0b2 100644
--- a/src/or/networkstatus.h
+++ b/src/or/networkstatus.h
@@ -12,7 +12,7 @@
#ifndef TOR_NETWORKSTATUS_H
#define TOR_NETWORKSTATUS_H
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
void networkstatus_reset_warnings(void);
void networkstatus_reset_download_failures(void);
diff --git a/src/or/router.h b/src/or/router.h
index 4a383ac420..54f61c45a6 100644
--- a/src/or/router.h
+++ b/src/or/router.h
@@ -12,7 +12,7 @@
#ifndef TOR_ROUTER_H
#define TOR_ROUTER_H
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
#define TOR_ROUTERINFO_ERROR_NO_EXT_ADDR (-1)
#define TOR_ROUTERINFO_ERROR_CANNOT_PARSE (-2)
diff --git a/src/or/routerlist.h b/src/or/routerlist.h
index a90c26b444..6d1e2a0b8a 100644
--- a/src/or/routerlist.h
+++ b/src/or/routerlist.h
@@ -11,7 +11,7 @@
#ifndef TOR_ROUTERLIST_H
#define TOR_ROUTERLIST_H
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
int get_n_authorities(dirinfo_type_t type);
int trusted_dirs_reload_certs(void);
diff --git a/src/or/scheduler.h b/src/or/scheduler.h
index 37c192fea9..856923f9a7 100644
--- a/src/or/scheduler.h
+++ b/src/or/scheduler.h
@@ -11,7 +11,7 @@
#include "or/or.h"
#include "or/channel.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
/** Scheduler type, we build an ordered list with those values from the
* parsed strings in Schedulers. The reason to do such a thing is so we can
diff --git a/src/or/status.h b/src/or/status.h
index 840ec11986..7258ed5939 100644
--- a/src/or/status.h
+++ b/src/or/status.h
@@ -4,7 +4,7 @@
#ifndef TOR_STATUS_H
#define TOR_STATUS_H
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
int log_heartbeat(time_t now);