[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/master] Automated fixup of include paths after torlog.h movement.
commit da4ae8a6b6bc45f301c1493bb55b09e2f1209ac2
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Fri Jun 22 10:32:10 2018 -0400
Automated fixup of include paths after torlog.h movement.
---
src/common/address.c | 2 +-
src/common/buffers.c | 2 +-
src/common/compat.c | 2 +-
src/common/compat_libevent.c | 2 +-
src/common/compat_pthreads.c | 2 +-
src/common/compat_threads.c | 2 +-
src/common/compat_time.c | 2 +-
src/common/compat_winthreads.c | 2 +-
src/common/confline.c | 2 +-
src/common/memarea.c | 2 +-
src/common/procmon.h | 2 +-
src/common/sandbox.c | 2 +-
src/common/storagedir.c | 2 +-
src/common/timers.c | 2 +-
src/common/util.c | 2 +-
src/common/util_bug.c | 2 +-
src/common/util_format.c | 2 +-
src/common/util_process.c | 2 +-
src/common/workqueue.c | 2 +-
src/lib/compress/compress.c | 2 +-
src/lib/compress/compress_lzma.c | 2 +-
src/lib/compress/compress_none.c | 2 +-
src/lib/compress/compress_zlib.c | 2 +-
src/lib/compress/compress_zstd.c | 2 +-
src/lib/crypt_ops/aes.c | 2 +-
src/lib/crypt_ops/crypto.c | 2 +-
src/lib/crypt_ops/crypto_curve25519.c | 2 +-
src/lib/crypt_ops/crypto_dh.c | 2 +-
src/lib/crypt_ops/crypto_digest.c | 2 +-
src/lib/crypt_ops/crypto_ed25519.c | 2 +-
src/lib/crypt_ops/crypto_format.c | 2 +-
src/lib/crypt_ops/crypto_rand.c | 2 +-
src/lib/crypt_ops/crypto_rsa.c | 2 +-
src/lib/crypt_ops/crypto_rsa.h | 2 +-
src/lib/crypt_ops/crypto_util.c | 2 +-
src/lib/log/torlog.c | 2 +-
src/lib/tls/buffers_tls.c | 2 +-
src/lib/tls/tortls.c | 2 +-
src/lib/trace/debug.h | 2 +-
src/or/keypin.c | 2 +-
src/or/onion_ntor.c | 2 +-
src/or/or.h | 2 +-
src/or/parsecommon.c | 2 +-
src/or/torcert.c | 2 +-
src/test/fuzz/fuzz_http.c | 2 +-
src/test/fuzz/fuzz_http_connect.c | 2 +-
src/test/log_test_helpers.c | 2 +-
src/test/test_bt_cl.c | 2 +-
src/test/test_logging.c | 2 +-
src/test/test_status.c | 2 +-
src/test/test_tortls.c | 2 +-
src/test/test_util_slow.c | 2 +-
src/tools/tor-gencert.c | 2 +-
src/tools/tor-resolve.c | 2 +-
54 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/src/common/address.c b/src/common/address.c
index f2cddd394..42052f85e 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -39,7 +39,7 @@
#include "common/util.h"
#include "common/util_format.h"
#include "common/address.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "lib/container/smartlist.h"
#include "common/sandbox.h"
#include "siphash.h"
diff --git a/src/common/buffers.c b/src/common/buffers.c
index 41f98ddf7..4e5f56c73 100644
--- a/src/common/buffers.c
+++ b/src/common/buffers.c
@@ -26,7 +26,7 @@
#include "lib/compress/compress.h"
#include "common/util.h"
#include "lib/cc/torint.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
diff --git a/src/common/compat.c b/src/common/compat.c
index 8929f2f3d..b4175c15a 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -124,7 +124,7 @@ SecureZeroMemory(PVOID ptr, SIZE_T cnt)
#include <sys/file.h>
#endif
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "common/util.h"
#include "lib/container/smartlist.h"
#include "common/address.h"
diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c
index e3216bfc4..a0b9bc535 100644
--- a/src/common/compat_libevent.c
+++ b/src/common/compat_libevent.c
@@ -14,7 +14,7 @@
#include "lib/crypt_ops/crypto_rand.h"
#include "common/util.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include <event2/event.h>
#include <event2/thread.h>
diff --git a/src/common/compat_pthreads.c b/src/common/compat_pthreads.c
index c2bde962f..e345cfef0 100644
--- a/src/common/compat_pthreads.c
+++ b/src/common/compat_pthreads.c
@@ -16,7 +16,7 @@
#include <time.h>
#include "common/compat.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "common/util.h"
/** Wraps a void (*)(void*) function and its argument so we can
diff --git a/src/common/compat_threads.c b/src/common/compat_threads.c
index 89214ab1d..e66143b35 100644
--- a/src/common/compat_threads.c
+++ b/src/common/compat_threads.c
@@ -17,7 +17,7 @@
#include "common/compat_threads.h"
#include "common/util.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#ifdef HAVE_SYS_EVENTFD_H
#include <sys/eventfd.h>
diff --git a/src/common/compat_time.c b/src/common/compat_time.c
index d3cbd02c6..148f2f895 100644
--- a/src/common/compat_time.c
+++ b/src/common/compat_time.c
@@ -35,7 +35,7 @@
#endif
#include "lib/err/torerr.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "common/util.h"
#ifdef _WIN32
diff --git a/src/common/compat_winthreads.c b/src/common/compat_winthreads.c
index 28981980b..d082af31c 100644
--- a/src/common/compat_winthreads.c
+++ b/src/common/compat_winthreads.c
@@ -16,7 +16,7 @@
#include <windows.h>
#include <process.h>
#include "common/util.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
/* This value is more or less total cargo-cult */
#define SPIN_COUNT 2000
diff --git a/src/common/confline.c b/src/common/confline.c
index 76f5ac04e..9e37bfbdb 100644
--- a/src/common/confline.c
+++ b/src/common/confline.c
@@ -6,7 +6,7 @@
#include "common/compat.h"
#include "common/confline.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "common/util.h"
#include "lib/container/smartlist.h"
diff --git a/src/common/memarea.c b/src/common/memarea.c
index ec10f0222..589277ba3 100644
--- a/src/common/memarea.c
+++ b/src/common/memarea.c
@@ -12,7 +12,7 @@
#include "common/memarea.h"
#include "common/util.h"
#include "common/compat.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#ifndef DISABLE_MEMORY_SENTINELS
diff --git a/src/common/procmon.h b/src/common/procmon.h
index 46b6435af..246ddd71d 100644
--- a/src/common/procmon.h
+++ b/src/common/procmon.h
@@ -12,7 +12,7 @@
#include "common/compat.h"
#include "common/compat_libevent.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
typedef struct tor_process_monitor_t tor_process_monitor_t;
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index 7e88ec9dd..b41b8f4ba 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -35,7 +35,7 @@
#include "common/sandbox.h"
#include "lib/container/map.h"
#include "lib/err/torerr.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "lib/cc/torint.h"
#include "common/util.h"
#include "tor_queue.h"
diff --git a/src/common/storagedir.c b/src/common/storagedir.c
index 82a5e1b21..10b230127 100644
--- a/src/common/storagedir.c
+++ b/src/common/storagedir.c
@@ -7,7 +7,7 @@
#include "common/memarea.h"
#include "common/sandbox.h"
#include "common/storagedir.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "common/util.h"
#ifdef HAVE_SYS_TYPES_H
diff --git a/src/common/timers.c b/src/common/timers.c
index 2c39cf74b..72562f4cf 100644
--- a/src/common/timers.c
+++ b/src/common/timers.c
@@ -34,7 +34,7 @@
#include "common/compat.h"
#include "common/compat_libevent.h"
#include "common/timers.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "common/util.h"
struct timeout_cb {
diff --git a/src/common/util.c b/src/common/util.c
index 2948e264d..986792ff2 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -15,7 +15,7 @@
#endif
#define UTIL_PRIVATE
#include "common/util.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "lib/crypt_ops/crypto_digest.h"
#include "lib/cc/torint.h"
#include "lib/container/smartlist.h"
diff --git a/src/common/util_bug.c b/src/common/util_bug.c
index 7d6dc0750..0e6190caf 100644
--- a/src/common/util_bug.c
+++ b/src/common/util_bug.c
@@ -9,7 +9,7 @@
#include "orconfig.h"
#include "common/util_bug.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "lib/err/backtrace.h"
#ifdef TOR_UNIT_TESTS
#include "lib/container/smartlist.h"
diff --git a/src/common/util_format.c b/src/common/util_format.c
index 8b299725a..04fd59d66 100644
--- a/src/common/util_format.c
+++ b/src/common/util_format.c
@@ -13,7 +13,7 @@
#include "orconfig.h"
#include <stddef.h>
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "common/util.h"
#include "common/util_format.h"
#include "lib/cc/torint.h"
diff --git a/src/common/util_process.c b/src/common/util_process.c
index 6eee659b2..321258b69 100644
--- a/src/common/util_process.c
+++ b/src/common/util_process.c
@@ -21,7 +21,7 @@
#include "common/compat.h"
#include "common/util.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "common/util_process.h"
#include "ht.h"
diff --git a/src/common/workqueue.c b/src/common/workqueue.c
index be51e4f10..84945882d 100644
--- a/src/common/workqueue.c
+++ b/src/common/workqueue.c
@@ -31,7 +31,7 @@
#include "common/util.h"
#include "common/workqueue.h"
#include "tor_queue.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include <event2/event.h>
diff --git a/src/lib/compress/compress.c b/src/lib/compress/compress.c
index cb130b693..64f10b45c 100644
--- a/src/lib/compress/compress.c
+++ b/src/lib/compress/compress.c
@@ -20,7 +20,7 @@
#endif
#include "common/util.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "lib/compress/compress.h"
#include "lib/compress/compress_lzma.h"
#include "lib/compress/compress_none.h"
diff --git a/src/lib/compress/compress_lzma.c b/src/lib/compress/compress_lzma.c
index 921aaa1d7..e7f3680b2 100644
--- a/src/lib/compress/compress_lzma.c
+++ b/src/lib/compress/compress_lzma.c
@@ -14,7 +14,7 @@
#include "orconfig.h"
#include "common/util.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "lib/compress/compress.h"
#include "lib/compress/compress_lzma.h"
diff --git a/src/lib/compress/compress_none.c b/src/lib/compress/compress_none.c
index 05a27e5cc..11f99d82e 100644
--- a/src/lib/compress/compress_none.c
+++ b/src/lib/compress/compress_none.c
@@ -17,7 +17,7 @@
#include "orconfig.h"
#include "common/util.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "lib/compress/compress.h"
#include "lib/compress/compress_none.h"
diff --git a/src/lib/compress/compress_zlib.c b/src/lib/compress/compress_zlib.c
index 56dda8a2d..7cba1150e 100644
--- a/src/lib/compress/compress_zlib.c
+++ b/src/lib/compress/compress_zlib.c
@@ -14,7 +14,7 @@
#include "orconfig.h"
#include "common/util.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "lib/compress/compress.h"
#include "lib/compress/compress_zlib.h"
diff --git a/src/lib/compress/compress_zstd.c b/src/lib/compress/compress_zstd.c
index 37204ab5e..f24c7a5ab 100644
--- a/src/lib/compress/compress_zstd.c
+++ b/src/lib/compress/compress_zstd.c
@@ -14,7 +14,7 @@
#include "orconfig.h"
#include "common/util.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "lib/compress/compress.h"
#include "lib/compress/compress_zstd.h"
diff --git a/src/lib/crypt_ops/aes.c b/src/lib/crypt_ops/aes.c
index c421453fd..3a66e369c 100644
--- a/src/lib/crypt_ops/aes.c
+++ b/src/lib/crypt_ops/aes.c
@@ -38,7 +38,7 @@ ENABLE_GCC_WARNING(redundant-decls)
#include "common/compat.h"
#include "lib/crypt_ops/aes.h"
#include "common/util.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "lib/ctime/di_ops.h"
#ifdef ANDROID
diff --git a/src/lib/crypt_ops/crypto.c b/src/lib/crypt_ops/crypto.c
index 46026b6ac..fcd6945c8 100644
--- a/src/lib/crypt_ops/crypto.c
+++ b/src/lib/crypt_ops/crypto.c
@@ -62,7 +62,7 @@ ENABLE_GCC_WARNING(redundant-decls)
#include <unistd.h>
#endif
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "lib/cc/torint.h"
#include "lib/crypt_ops/aes.h"
#include "common/util.h"
diff --git a/src/lib/crypt_ops/crypto_curve25519.c b/src/lib/crypt_ops/crypto_curve25519.c
index 03225f1c1..276ff208a 100644
--- a/src/lib/crypt_ops/crypto_curve25519.c
+++ b/src/lib/crypt_ops/crypto_curve25519.c
@@ -26,7 +26,7 @@
#include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h"
#include "common/util.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "ed25519/donna/ed25519_donna_tor.h"
diff --git a/src/lib/crypt_ops/crypto_dh.c b/src/lib/crypt_ops/crypto_dh.c
index 2442dae55..daa984293 100644
--- a/src/lib/crypt_ops/crypto_dh.c
+++ b/src/lib/crypt_ops/crypto_dh.c
@@ -23,7 +23,7 @@ ENABLE_GCC_WARNING(redundant-decls)
#include <openssl/bn.h>
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
/** A structure to hold the first half (x, g^x) of a Diffie-Hellman handshake
* while we're waiting for the second.*/
diff --git a/src/lib/crypt_ops/crypto_digest.c b/src/lib/crypt_ops/crypto_digest.c
index b1aede3a8..a50543593 100644
--- a/src/lib/crypt_ops/crypto_digest.c
+++ b/src/lib/crypt_ops/crypto_digest.c
@@ -14,7 +14,7 @@
#include "lib/crypt_ops/crypto_digest.h"
#include "lib/crypt_ops/crypto_openssl_mgt.h"
#include "lib/crypt_ops/crypto_util.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "keccak-tiny/keccak-tiny.h"
diff --git a/src/lib/crypt_ops/crypto_ed25519.c b/src/lib/crypt_ops/crypto_ed25519.c
index ca1030b0a..5655fbf50 100644
--- a/src/lib/crypt_ops/crypto_ed25519.c
+++ b/src/lib/crypt_ops/crypto_ed25519.c
@@ -27,7 +27,7 @@
#include "lib/crypt_ops/crypto_format.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "common/util.h"
#include "common/util_format.h"
diff --git a/src/lib/crypt_ops/crypto_format.c b/src/lib/crypt_ops/crypto_format.c
index e4237653f..888c0794e 100644
--- a/src/lib/crypt_ops/crypto_format.c
+++ b/src/lib/crypt_ops/crypto_format.c
@@ -23,7 +23,7 @@
#include "lib/string/util_string.h"
#include "common/util.h"
#include "common/util_format.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
/** Write the <b>datalen</b> bytes from <b>data</b> to the file named
* <b>fname</b> in the tagged-data format. This format contains a
diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c
index 0d41a207e..bff32c7ec 100644
--- a/src/lib/crypt_ops/crypto_rand.c
+++ b/src/lib/crypt_ops/crypto_rand.c
@@ -27,7 +27,7 @@
#include "lib/crypt_ops/crypto_util.h"
#include "common/sandbox.h"
#include "lib/testsupport/testsupport.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "common/util.h"
#include "common/util_format.h"
diff --git a/src/lib/crypt_ops/crypto_rsa.c b/src/lib/crypt_ops/crypto_rsa.c
index a20d47132..3f2f8544f 100644
--- a/src/lib/crypt_ops/crypto_rsa.c
+++ b/src/lib/crypt_ops/crypto_rsa.c
@@ -33,7 +33,7 @@ DISABLE_GCC_WARNING(redundant-decls)
ENABLE_GCC_WARNING(redundant-decls)
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "common/util.h"
#include "common/util_format.h"
diff --git a/src/lib/crypt_ops/crypto_rsa.h b/src/lib/crypt_ops/crypto_rsa.h
index 3faec1237..75255c9cc 100644
--- a/src/lib/crypt_ops/crypto_rsa.h
+++ b/src/lib/crypt_ops/crypto_rsa.h
@@ -21,7 +21,7 @@
#include "lib/testsupport/testsupport.h"
#include "common/compat.h"
#include "common/util.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
/** Length of our public keys. */
#define PK_BYTES (1024/8)
diff --git a/src/lib/crypt_ops/crypto_util.c b/src/lib/crypt_ops/crypto_util.c
index 8ef0690c1..db88805a7 100644
--- a/src/lib/crypt_ops/crypto_util.c
+++ b/src/lib/crypt_ops/crypto_util.c
@@ -32,7 +32,7 @@ DISABLE_GCC_WARNING(redundant-decls)
ENABLE_GCC_WARNING(redundant-decls)
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
/**
* Destroy the <b>sz</b> bytes of data stored at <b>mem</b>, setting them to
diff --git a/src/lib/log/torlog.c b/src/lib/log/torlog.c
index e67442e68..e77b775c2 100644
--- a/src/lib/log/torlog.c
+++ b/src/lib/log/torlog.c
@@ -31,7 +31,7 @@
#endif
#define LOG_PRIVATE
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "lib/container/smartlist.h"
#include "lib/err/torerr.h"
#include "lib/intmath/bits.h"
diff --git a/src/lib/tls/buffers_tls.c b/src/lib/tls/buffers_tls.c
index 55c3ac334..ac78b6501 100644
--- a/src/lib/tls/buffers_tls.c
+++ b/src/lib/tls/buffers_tls.c
@@ -12,7 +12,7 @@
#include "common/compat.h"
#include "common/util.h"
#include "lib/cc/torint.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "lib/tls/tortls.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
diff --git a/src/lib/tls/tortls.c b/src/lib/tls/tortls.c
index eb8a91b42..6fa0611f1 100644
--- a/src/lib/tls/tortls.c
+++ b/src/lib/tls/tortls.c
@@ -54,7 +54,7 @@ ENABLE_GCC_WARNING(redundant-decls)
#define TORTLS_PRIVATE
#include "lib/tls/tortls.h"
#include "common/util.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "lib/container/smartlist.h"
#include <string.h>
diff --git a/src/lib/trace/debug.h b/src/lib/trace/debug.h
index 0241f2ccf..9b5d9d05c 100644
--- a/src/lib/trace/debug.h
+++ b/src/lib/trace/debug.h
@@ -4,7 +4,7 @@
#ifndef TOR_TRACE_LOG_DEBUG_H
#define TOR_TRACE_LOG_DEBUG_H
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
/* Stringify pre-processor trick. */
#define XSTR(d) STR(d)
diff --git a/src/or/keypin.c b/src/or/keypin.c
index 1bdb471b3..312530fe4 100644
--- a/src/or/keypin.c
+++ b/src/or/keypin.c
@@ -19,7 +19,7 @@
#include "or/keypin.h"
#include "siphash.h"
#include "lib/cc/torint.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "common/util.h"
#include "common/util_format.h"
diff --git a/src/or/onion_ntor.c b/src/or/onion_ntor.c
index a6685eb99..3a60d1b7e 100644
--- a/src/or/onion_ntor.c
+++ b/src/or/onion_ntor.c
@@ -26,7 +26,7 @@
#include "lib/crypt_ops/crypto_digest.h"
#include "lib/crypt_ops/crypto_util.h"
#include "or/onion_ntor.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "common/util.h"
/** Free storage held in an ntor handshake state. */
diff --git a/src/or/or.h b/src/or/or.h
index 5c2a6d300..528159b4c 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -68,7 +68,7 @@
#include "lib/crypt_ops/crypto_dh.h"
#include "lib/crypt_ops/crypto_hkdf.h"
#include "lib/tls/tortls.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "lib/container/smartlist.h"
#include "lib/container/map.h"
#include "lib/compress/compress.h"
diff --git a/src/or/parsecommon.c b/src/or/parsecommon.c
index 298d3658b..17a7c6a89 100644
--- a/src/or/parsecommon.c
+++ b/src/or/parsecommon.c
@@ -7,7 +7,7 @@
**/
#include "or/parsecommon.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "common/util_format.h"
#include "lib/container/smartlist.h"
diff --git a/src/or/torcert.c b/src/or/torcert.c
index 23dfd3d43..e307dd1b5 100644
--- a/src/or/torcert.c
+++ b/src/or/torcert.c
@@ -30,7 +30,7 @@
#include "lib/crypt_ops/crypto_util.h"
#include "or/torcert.h"
#include "trunnel/ed25519_cert.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "common/util.h"
#include "common/compat.h"
#include "trunnel/link_handshake.h"
diff --git a/src/test/fuzz/fuzz_http.c b/src/test/fuzz/fuzz_http.c
index 564edbb55..c82c658d9 100644
--- a/src/test/fuzz/fuzz_http.c
+++ b/src/test/fuzz/fuzz_http.c
@@ -12,7 +12,7 @@
#include "or/config.h"
#include "or/connection.h"
#include "or/directory.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "or/dir_connection_st.h"
diff --git a/src/test/fuzz/fuzz_http_connect.c b/src/test/fuzz/fuzz_http_connect.c
index 1cde742f2..32bd26135 100644
--- a/src/test/fuzz/fuzz_http_connect.c
+++ b/src/test/fuzz/fuzz_http_connect.c
@@ -13,7 +13,7 @@
#include "or/connection.h"
#include "or/connection_edge.h"
#include "or/proto_socks.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "or/entry_connection_st.h"
#include "or/socks_request_st.h"
diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c
index 03429b72c..e814555ba 100644
--- a/src/test/log_test_helpers.c
+++ b/src/test/log_test_helpers.c
@@ -1,7 +1,7 @@
/* Copyright (c) 2015-2018, The Tor Project, Inc. */
/* See LICENSE for licensing information */
#define LOG_PRIVATE
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "test/log_test_helpers.h"
/**
diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c
index 66dd931e5..c64ca8e2b 100644
--- a/src/test/test_bt_cl.c
+++ b/src/test/test_bt_cl.c
@@ -10,7 +10,7 @@
#include "or/or.h"
#include "common/util.h"
#include "lib/err/backtrace.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
/* -1: no crash.
* 0: crash with a segmentation fault.
diff --git a/src/test/test_logging.c b/src/test/test_logging.c
index d31c70437..c92dd620f 100644
--- a/src/test/test_logging.c
+++ b/src/test/test_logging.c
@@ -4,7 +4,7 @@
#include "orconfig.h"
#include "or/or.h"
#include "lib/err/torerr.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "test/test.h"
static void
diff --git a/src/test/test_status.c b/src/test/test_status.c
index 2f305224c..09b9662b4 100644
--- a/src/test/test_status.c
+++ b/src/test/test_status.c
@@ -12,7 +12,7 @@
#include <math.h>
#include "or/or.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "tor_queue.h"
#include "or/status.h"
#include "or/circuitlist.h"
diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c
index 80f95b6c0..f1b9b99f5 100644
--- a/src/test/test_tortls.c
+++ b/src/test/test_tortls.c
@@ -31,7 +31,7 @@ DISABLE_GCC_WARNING(redundant-decls)
ENABLE_GCC_WARNING(redundant-decls)
#include "or/or.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "or/config.h"
#include "lib/tls/tortls.h"
diff --git a/src/test/test_util_slow.c b/src/test/test_util_slow.c
index 9e4d7b0a1..9fbcd9d2b 100644
--- a/src/test/test_util_slow.c
+++ b/src/test/test_util_slow.c
@@ -8,7 +8,7 @@
#include "common/util.h"
#include "common/util_process.h"
#include "lib/crypt_ops/crypto.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "test/test.h"
#ifndef BUILDDIR
diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c
index c2a2e0151..fc490ffeb 100644
--- a/src/tools/tor-gencert.c
+++ b/src/tools/tor-gencert.c
@@ -36,7 +36,7 @@ ENABLE_GCC_WARNING(redundant-decls)
#endif
#include "common/util.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "lib/crypt_ops/crypto.h"
#include "lib/crypt_ops/crypto_digest.h"
#include "lib/crypt_ops/crypto_rand.h"
diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index 85ff14167..d80a7400f 100644
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -7,7 +7,7 @@
#include "common/compat.h"
#include "common/util.h"
#include "common/address.h"
-#include "common/torlog.h"
+#include "lib/log/torlog.h"
#include "common/sandbox.h"
#include <stdio.h>
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits