commit ec4eee63561c3f6a8bb0c466f17b92e99f832c5d Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 28 09:42:33 2018 -0400

Fix the include paths for storagedir,conffile (automated) --- src/or/config.c | 2 +- src/or/conscache.c | 2 +- src/test/test_config.c | 2 +- src/test/test_storagedir.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c index b0141b9c0..bdc963a86 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -111,7 +111,7 @@ #include <shlobj.h> #endif

-#include "common/conffile.h" +#include "lib/fs/conffile.h" #include "common/procmon.h"

#include "or/dirauth/dirvote.h" diff --git a/src/or/conscache.c b/src/or/conscache.c index 63ff0db78..bc3a09509 100644 --- a/src/or/conscache.c +++ b/src/or/conscache.c @@ -6,7 +6,7 @@ #include "or/config.h" #include "or/conscache.h" #include "lib/crypt_ops/crypto_util.h" -#include "common/storagedir.h" +#include "lib/fs/storagedir.h"

#define CCE_MAGIC 0x17162253

diff --git a/src/test/test_config.c b/src/test/test_config.c index dcdaa2ed5..4676cc897 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -48,7 +48,7 @@ #include "or/port_cfg_st.h" #include "or/routerinfo_st.h"

-#include "common/conffile.h" +#include "lib/fs/conffile.h"

static void test_config_addressmap(void *arg) diff --git a/src/test/test_storagedir.c b/src/test/test_storagedir.c index 4dd767352..d07d35e09 100644 --- a/src/test/test_storagedir.c +++ b/src/test/test_storagedir.c @@ -3,7 +3,7 @@

#include "or/or.h" #include "lib/crypt_ops/crypto_rand.h" -#include "common/storagedir.h" +#include "lib/fs/storagedir.h" #include "test/test.h"

#ifdef HAVE_UTIME_H