[tor-commits] [tor/master] rectify include paths (automatic) for confline.h

[nickm at torproject.org]

commit 0b7452eeb2f2dee7acefee2d3ca2cb402a877ea1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 27 16:54:57 2018 -0400

    rectify include paths (automatic) for confline.h
---
 src/common/conffile.c   | 2 +-
 src/common/storagedir.c | 2 +-
 src/or/or.h             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/common/conffile.c b/src/common/conffile.c
index bfb78c35c..d3215a22e 100644
--- a/src/common/conffile.c
+++ b/src/common/conffile.c
@@ -5,7 +5,7 @@
 /* See LICENSE for licensing information */
 
 #include "common/compat.h"
-#include "common/confline.h"
+#include "lib/encoding/confline.h"
 #include "common/conffile.h"
 #include "lib/log/torlog.h"
 #include "common/util.h"
diff --git a/src/common/storagedir.c b/src/common/storagedir.c
index 0e0618d51..53b785bcf 100644
--- a/src/common/storagedir.c
+++ b/src/common/storagedir.c
@@ -3,7 +3,7 @@
 
 #include "lib/container/smartlist.h"
 #include "common/compat.h"
-#include "common/confline.h"
+#include "lib/encoding/confline.h"
 #include "common/memarea.h"
 #include "lib/sandbox/sandbox.h"
 #include "common/storagedir.h"
diff --git a/src/or/or.h b/src/or/or.h
index df0e60c26..ebafc607f 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -75,7 +75,7 @@
 #include "lib/net/address.h"
 #include "common/compat_libevent.h"
 #include "ht.h"
-#include "common/confline.h"
+#include "lib/encoding/confline.h"
 #include "or/replaycache.h"
 #include "lib/crypt_ops/crypto_curve25519.h"
 #include "lib/crypt_ops/crypto_ed25519.h"