Automated fixup of include paths after torlog.h movement.

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"

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

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"

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>

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

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>

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

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

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"
 

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
 

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;
 

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"

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

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 {

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"

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"

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"

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"
 

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>
 

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"

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"
 

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"
 

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"
 

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"
 

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

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"

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"
 

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.*/

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"
 

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"
 

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

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"
 

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"
 

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)

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

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"

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>

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>
 

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)

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"
 

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. */

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"

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"
 

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"

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"
 

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"

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"
 
 /**

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.

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

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"

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"
 

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

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"

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>