diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-27 14:45:14 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-27 14:45:14 -0400 |
| commit | 21136037182f55b5aef3730853e65fa2c7ebd722 (patch) | |
| tree | b7c34c053994378170a4b080adcc1c77ccc51b40 /src/or | |
| parent | b9b05e437d09c4d06b554d0484c7ae1a3aa1d647 (diff) | |
| parent | 05040a9e84caab86fb66793a7604887d2aaaa2d9 (diff) | |
| download | tor-21136037182f55b5aef3730853e65fa2c7ebd722.tar.gz tor-21136037182f55b5aef3730853e65fa2c7ebd722.zip | |
Merge branch 'sandbox_refactor'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/config.c | 2 | ||||
| -rw-r--r-- | src/or/connection.c | 2 | ||||
| -rw-r--r-- | src/or/dns.c | 2 | ||||
| -rw-r--r-- | src/or/main.c | 2 | ||||
| -rw-r--r-- | src/or/routerlist.c | 2 | ||||
| -rw-r--r-- | src/or/routerparse.c | 2 | ||||
| -rw-r--r-- | src/or/statefile.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/src/or/config.c b/src/or/config.c index cc3cc3ec55..98f3ff77b0 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -98,7 +98,7 @@ #include "or/hs_config.h" #include "or/rephist.h" #include "or/router.h" -#include "common/sandbox.h" +#include "lib/sandbox/sandbox.h" #include "common/util.h" #include "or/routerlist.h" #include "or/routerset.h" diff --git a/src/or/connection.c b/src/or/connection.c index e06e9c650a..01067e94f4 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -102,7 +102,7 @@ #include "or/routerlist.h" #include "or/transports.h" #include "or/routerparse.h" -#include "common/sandbox.h" +#include "lib/sandbox/sandbox.h" #ifdef HAVE_PWD_H #include <pwd.h> diff --git a/src/or/dns.c b/src/or/dns.c index 8d809d8c3c..ddb50d1964 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -63,7 +63,7 @@ #include "or/relay.h" #include "or/router.h" #include "ht.h" -#include "common/sandbox.h" +#include "lib/sandbox/sandbox.h" #include "or/edge_connection_st.h" #include "or/or_circuit_st.h" diff --git a/src/or/main.c b/src/or/main.c index c690fdd906..1c77cdfb56 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -111,7 +111,7 @@ #include "common/util_process.h" #include "or/ext_orport.h" #include "common/memarea.h" -#include "common/sandbox.h" +#include "lib/sandbox/sandbox.h" #include <event2/event.h> diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 66967f13f5..a86e29adb2 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -119,7 +119,7 @@ #include "or/routerlist.h" #include "or/routerparse.h" #include "or/routerset.h" -#include "common/sandbox.h" +#include "lib/sandbox/sandbox.h" #include "or/torcert.h" #include "or/dirauth/dirvote.h" diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 91475cd511..8f5113f041 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -74,7 +74,7 @@ #include "or/routerkeys.h" #include "or/routerlist.h" #include "or/routerparse.h" -#include "common/sandbox.h" +#include "lib/sandbox/sandbox.h" #include "or/shared_random_client.h" #include "or/torcert.h" #include "or/voting_schedule.h" diff --git a/src/or/statefile.c b/src/or/statefile.c index 53a25e13f2..80c56b2d52 100644 --- a/src/or/statefile.c +++ b/src/or/statefile.c @@ -40,7 +40,7 @@ #include "or/main.h" #include "or/rephist.h" #include "or/router.h" -#include "common/sandbox.h" +#include "lib/sandbox/sandbox.h" #include "or/statefile.h" /** A list of state-file "abbreviations," for compatibility. */ |