From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 27 Jun 2018 20:54:57 +0000 (-0400)
Subject: rectify include paths (automatic) for confline.h
X-Git-Tag: tor-0.3.5.1-alpha~341
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b7452eeb2f2dee7acefee2d3ca2cb402a877ea1;p=thirdparty%2Ftor.git

rectify include paths (automatic) for confline.h
---

diff --git a/src/common/conffile.c b/src/common/conffile.c
index bfb78c35c6..d3215a22ed 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 0e0618d517..53b785bcf1 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 df0e60c262..ebafc607f3 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"