Rename torlog.[ch] to log.[ch]

Fun fact: these files used to be called log.[ch] until we ran into
conflicts with systems having a log.h file.  But now that we always
include "lib/log/log.h", we should be fine.

diff --git a/src/core/crypto/onion_ntor.c b/src/core/crypto/onion_ntor.c
index 9e1e273ef63cd67bd4fecc032d1b5712783cb757..ea7261cb53a7fe0310abc4e09a3a6776ac93b5a3 100644 (file)
--- a/src/core/crypto/onion_ntor.c
+++ b/src/core/crypto/onion_ntor.c
@@ -27,7 +27,7 @@
 #include "lib/crypt_ops/crypto_hkdf.h"
 #include "lib/crypt_ops/crypto_util.h"
 #include "lib/ctime/di_ops.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "core/crypto/onion_ntor.h"
 

diff --git a/src/feature/dirauth/keypin.c b/src/feature/dirauth/keypin.c
index 44e19985facf70f8795363d9c0b52630187f6712..fd281377df0b0f9f4813e4e7a5f516f107677563 100644 (file)
--- a/src/feature/dirauth/keypin.c
+++ b/src/feature/dirauth/keypin.c
@@ -23,7 +23,7 @@
 #include "lib/fdio/fdio.h"
 #include "lib/fs/files.h"
 #include "lib/fs/mmap.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/string/compat_ctype.h"
 #include "lib/string/printf.h"

diff --git a/src/feature/nodelist/parsecommon.c b/src/feature/nodelist/parsecommon.c
index 4f1c3fd421d67fb6c72d270edccbd3b7f0d75d46..3aaf8ac501b3eb27bc62f0045146a5df5ef6d059 100644 (file)
--- a/src/feature/nodelist/parsecommon.c
+++ b/src/feature/nodelist/parsecommon.c
@@ -7,7 +7,7 @@
  **/
 
 #include "feature/nodelist/parsecommon.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/encoding/binascii.h"
 #include "lib/container/smartlist.h"

diff --git a/src/feature/nodelist/torcert.c b/src/feature/nodelist/torcert.c
index 172d4f9de381885536fb435903c21af5f3a75d98..a27608202181fd5de087396c1eccb7f24340fe81 100644 (file)
--- a/src/feature/nodelist/torcert.c
+++ b/src/feature/nodelist/torcert.c
@@ -30,7 +30,7 @@
 #include "lib/crypt_ops/crypto_util.h"
 #include "feature/nodelist/torcert.h"
 #include "trunnel/ed25519_cert.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "trunnel/link_handshake.h"
 #include "lib/tls/tortls.h"
 

diff --git a/src/lib/compress/compress.c b/src/lib/compress/compress.c
index ff1aea47a46212b8b41016cbf8e9c9546f0f6735..2ad9b15b2ee1f1cb47b16895f66acb4ec838e2b7 100644 (file)
--- a/src/lib/compress/compress.c
+++ b/src/lib/compress/compress.c
@@ -22,7 +22,7 @@
 #include <netinet/in.h>
 #endif
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/arch/bytes.h"
 #include "lib/ctime/di_ops.h"

diff --git a/src/lib/compress/compress_lzma.c b/src/lib/compress/compress_lzma.c
index 9091832ed3e59f1008cb2db4b41ae72844e41875..e6c8368f6aa3d6448835a977c2cf4c9f434c5330 100644 (file)
--- a/src/lib/compress/compress_lzma.c
+++ b/src/lib/compress/compress_lzma.c
@@ -15,7 +15,7 @@
 
 #include "lib/compress/compress.h"
 #include "lib/compress/compress_lzma.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/malloc/malloc.h"
 #include "lib/thread/threads.h"

diff --git a/src/lib/compress/compress_none.c b/src/lib/compress/compress_none.c
index 9574c47a7e48e6545795d1730f214e0314ac8d75..a0e82d5a9971470da87db9d7612ed10bc256abb7 100644 (file)
--- a/src/lib/compress/compress_none.c
+++ b/src/lib/compress/compress_none.c
@@ -16,7 +16,7 @@
 
 #include "orconfig.h"
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/compress/compress.h"
 #include "lib/compress/compress_none.h"
 #include "lib/intmath/cmp.h"

diff --git a/src/lib/compress/compress_zlib.c b/src/lib/compress/compress_zlib.c
index 12e6727dee8fca1c01cf31cfc27ad87460d03dc6..64be1d4256a37cd6d9cd29f32aee7c9c22de01f9 100644 (file)
--- a/src/lib/compress/compress_zlib.c
+++ b/src/lib/compress/compress_zlib.c
@@ -13,7 +13,7 @@
 
 #include "orconfig.h"
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.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 0a553db55cacc20a28bc907618d93a385cc85b5b..0a71fed4b85e0a2d04d4d577878d8606b7d51b9d 100644 (file)
--- a/src/lib/compress/compress_zstd.c
+++ b/src/lib/compress/compress_zstd.c
@@ -13,7 +13,7 @@
 
 #include "orconfig.h"
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/compress/compress.h"
 #include "lib/compress/compress_zstd.h"

diff --git a/src/lib/container/buffers.c b/src/lib/container/buffers.c
index 525747a4c9ffef870e5475fce3c6f2a815c7870a..87d782d7eff77ee05a9e9a98e4f551ae35391cd5 100644 (file)
--- a/src/lib/container/buffers.c
+++ b/src/lib/container/buffers.c
@@ -27,7 +27,7 @@
 #include <stddef.h>
 #include "lib/container/buffers.h"
 #include "lib/cc/torint.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/ctime/di_ops.h"
 #include "lib/malloc/malloc.h"

diff --git a/src/lib/crypt_ops/aes.c b/src/lib/crypt_ops/aes.c
index a01b1e16b2c3e27ac3045e9faa914a3f9827f809..ff9d4d855ce62022620aa79e18fe6562a5e3f4da 100644 (file)
--- a/src/lib/crypt_ops/aes.c
+++ b/src/lib/crypt_ops/aes.c
@@ -38,7 +38,7 @@ DISABLE_GCC_WARNING(redundant-decls)
 ENABLE_GCC_WARNING(redundant-decls)
 
 #include "lib/crypt_ops/aes.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.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 48574016bf0ee9c85beb44b4286d3cfe164796ad..5bc2da76ab741c75d3a39cec4adf3710fd238903 100644 (file)
--- 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 "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/cc/torint.h"
 #include "lib/crypt_ops/aes.h"

diff --git a/src/lib/crypt_ops/crypto_curve25519.c b/src/lib/crypt_ops/crypto_curve25519.c
index 09f492e544d680625b45a313601669efd38a67e9..6ad2587f489aaecce3d13970fd88461dcf9e3ac6 100644 (file)
--- 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_format.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/crypt_ops/crypto_util.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.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 c37e286daf27df37ac377499ca17762f8dd0c5a0..3e8299693524a7edb138128da77534736a74487e 100644 (file)
--- a/src/lib/crypt_ops/crypto_dh.c
+++ b/src/lib/crypt_ops/crypto_dh.c
@@ -14,7 +14,7 @@
 #include "lib/crypt_ops/crypto_digest.h"
 #include "lib/crypt_ops/crypto_hkdf.h"
 #include "lib/crypt_ops/crypto_util.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 
 DISABLE_GCC_WARNING(redundant-decls)

diff --git a/src/lib/crypt_ops/crypto_digest.c b/src/lib/crypt_ops/crypto_digest.c
index 949e694053fe380537fbddf8a796af8b83b96755..ee5c362e38e44b132c26c5189ea3d0ac91349834 100644 (file)
--- 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 "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.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 985652ecbac48312c4904e664f037b999f63d5e7..9d2c9e9fabd7bcca3e8fcb0ded0907b3a1f1c28d 100644 (file)
--- a/src/lib/crypt_ops/crypto_ed25519.c
+++ b/src/lib/crypt_ops/crypto_ed25519.c
@@ -28,7 +28,7 @@
 #include "lib/crypt_ops/crypto_format.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/crypt_ops/crypto_util.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/encoding/binascii.h"
 #include "lib/string/util_string.h"

diff --git a/src/lib/crypt_ops/crypto_format.c b/src/lib/crypt_ops/crypto_format.c
index 8c71b265bfdf3022c2b4cc78b3edbcf3c825ae0b..50916a8d68d929b87ca42bb21ed5650512366230 100644 (file)
--- a/src/lib/crypt_ops/crypto_format.c
+++ b/src/lib/crypt_ops/crypto_format.c
@@ -24,7 +24,7 @@
 #include "lib/string/util_string.h"
 #include "lib/string/printf.h"
 #include "lib/encoding/binascii.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/fs/files.h"
 

diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c
index e2d72a77c0bc585ebc5001c1a5e847e4171e97c5..fb9d0c2c6c78d1a1290f597b2fcb43e80bf696ed 100644 (file)
--- a/src/lib/crypt_ops/crypto_rand.c
+++ b/src/lib/crypt_ops/crypto_rand.c
@@ -26,7 +26,7 @@
 #include "lib/crypt_ops/crypto_util.h"
 #include "lib/encoding/binascii.h"
 #include "lib/intmath/weakrng.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/malloc/malloc.h"
 #include "lib/sandbox/sandbox.h"

diff --git a/src/lib/crypt_ops/crypto_rsa.c b/src/lib/crypt_ops/crypto_rsa.c
index 9290414de033e84e1df94b9c78bdbed66f6098bb..5ec69d7319614f907368bf9257d846017ae2c415 100644 (file)
--- a/src/lib/crypt_ops/crypto_rsa.c
+++ b/src/lib/crypt_ops/crypto_rsa.c
@@ -36,7 +36,7 @@ DISABLE_GCC_WARNING(redundant-decls)
 
 ENABLE_GCC_WARNING(redundant-decls)
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/encoding/binascii.h"
 
 #include <string.h>

diff --git a/src/lib/crypt_ops/crypto_rsa.h b/src/lib/crypt_ops/crypto_rsa.h
index 093f2cec6c76948ecb84660cb9226b03098cf231..51fc974821cb917d69bb9a68181918595707e357 100644 (file)
--- a/src/lib/crypt_ops/crypto_rsa.h
+++ b/src/lib/crypt_ops/crypto_rsa.h
@@ -18,7 +18,7 @@
 #include "lib/crypt_ops/crypto_digest.h"
 #include "lib/cc/torint.h"
 #include "lib/testsupport/testsupport.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.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 19b0885256ab7db1aeeb6e2ead5cbac21c8b1e72..79988c6a91a88338285573a050b1b5376709a983 100644 (file)
--- a/src/lib/crypt_ops/crypto_util.c
+++ b/src/lib/crypt_ops/crypto_util.c
@@ -31,7 +31,7 @@ DISABLE_GCC_WARNING(redundant-decls)
 
 ENABLE_GCC_WARNING(redundant-decls)
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 
 /**

diff --git a/src/lib/encoding/binascii.c b/src/lib/encoding/binascii.c
index 7499d64720f0dbe2bc7462548d60adb30cddd5c8..e9140d9432b7211068d3a6429d44e99367e0dc7d 100644 (file)
--- a/src/lib/encoding/binascii.c
+++ b/src/lib/encoding/binascii.c
@@ -14,7 +14,7 @@
 #include "orconfig.h"
 
 #include "lib/encoding/binascii.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/cc/torint.h"
 #include "lib/string/compat_ctype.h"

diff --git a/src/lib/encoding/confline.c b/src/lib/encoding/confline.c
index 9b17629537b6fa04610708ef10c263f4b0887e4c..dd5193d3a7a2ec6ac3cd4858094713138a185c16 100644 (file)
--- a/src/lib/encoding/confline.c
+++ b/src/lib/encoding/confline.c
@@ -17,7 +17,7 @@
 
 #include "lib/encoding/confline.h"
 #include "lib/encoding/cstring.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/malloc/malloc.h"
 #include "lib/string/compat_ctype.h"

diff --git a/src/lib/encoding/cstring.c b/src/lib/encoding/cstring.c
index 3e0db712f922bf0199dcd24fec140a94b932953d..69aa7f3da500201ae9c94f40dcec92ac8f6881c5 100644 (file)
--- a/src/lib/encoding/cstring.c
+++ b/src/lib/encoding/cstring.c
@@ -11,7 +11,7 @@
  **/
 
 #include "lib/encoding/cstring.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/malloc/malloc.h"
 #include "lib/string/compat_ctype.h"

diff --git a/src/lib/encoding/keyval.c b/src/lib/encoding/keyval.c
index 53ee776fe78db4f7e6f117d8b23607e04ba4308f..d5e4e4e4388b96c7598558115276e272eb73bdaf 100644 (file)
--- a/src/lib/encoding/keyval.c
+++ b/src/lib/encoding/keyval.c
@@ -12,7 +12,7 @@
 #include "orconfig.h"
 #include "lib/encoding/keyval.h"
 #include "lib/log/escape.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 
 #include <stdlib.h>

diff --git a/src/lib/encoding/time_fmt.c b/src/lib/encoding/time_fmt.c
index 8ce15e7477f540d32dcbcc71595f2e21fd425b87..42b1cc646bfb02f4c86ac85e90ec2d1e94a71427 100644 (file)
--- a/src/lib/encoding/time_fmt.c
+++ b/src/lib/encoding/time_fmt.c
@@ -15,7 +15,7 @@
  **/
 
 #include "lib/encoding/time_fmt.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/escape.h"
 #include "lib/log/util_bug.h"
 #include "lib/malloc/malloc.h"

diff --git a/src/lib/evloop/compat_libevent.c b/src/lib/evloop/compat_libevent.c
index 5e5faf163c718bb4664f9534a243b464ff7c2aee..2ee71c5598cd99b4348617a6c4e0d05b8ec0e469 100644 (file)
--- a/src/lib/evloop/compat_libevent.c
+++ b/src/lib/evloop/compat_libevent.c
@@ -11,7 +11,7 @@
 #include "lib/evloop/compat_libevent.h"
 
 #include "lib/crypt_ops/crypto_rand.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/string/compat_string.h"
 

diff --git a/src/lib/evloop/procmon.c b/src/lib/evloop/procmon.c
index 53c458f159b1d95a8e433681e462e2bc7217e106..e0c26caab24a125a3828dbab558144e453ee4d03 100644 (file)
--- a/src/lib/evloop/procmon.c
+++ b/src/lib/evloop/procmon.c
@@ -8,7 +8,7 @@
 
 #include "lib/evloop/procmon.h"
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/log/win32err.h"
 #include "lib/malloc/malloc.h"

diff --git a/src/lib/evloop/procmon.h b/src/lib/evloop/procmon.h
index b596e5cc6de6afc1f3fb1688953634546bcdacea..42c3788692d2f91e7015f1b21d4042aeda39192c 100644 (file)
--- a/src/lib/evloop/procmon.h
+++ b/src/lib/evloop/procmon.h
@@ -11,7 +11,7 @@
 
 #include "lib/evloop/compat_libevent.h"
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 
 typedef struct tor_process_monitor_t tor_process_monitor_t;
 

diff --git a/src/lib/evloop/timers.c b/src/lib/evloop/timers.c
index 4580b89e3c61d3e1b5e9d7783b3a01a5dadf6b8a..c4e85c7c93118c7ddf2ac8fc4ce1ad74b3e48d55 100644 (file)
--- a/src/lib/evloop/timers.c
+++ b/src/lib/evloop/timers.c
@@ -34,7 +34,7 @@
 #include "lib/evloop/compat_libevent.h"
 #include "lib/evloop/timers.h"
 #include "lib/intmath/muldiv.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/malloc/malloc.h"
 #include "lib/time/compat_time.h"

diff --git a/src/lib/evloop/workqueue.c b/src/lib/evloop/workqueue.c
index 4d36f352e3abf84d882ef3e0497c1a087ca8eae6..931f65e710baef265cd0ea6307bdcb019b9482aa 100644 (file)
--- a/src/lib/evloop/workqueue.c
+++ b/src/lib/evloop/workqueue.c
@@ -30,7 +30,7 @@
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/intmath/weakrng.h"
 #include "lib/log/ratelim.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/net/alertsock.h"
 #include "lib/net/socket.h"

diff --git a/src/lib/fs/conffile.c b/src/lib/fs/conffile.c
index 3a4d95f4508c8e724b425b1eb2f4023acde9d1f7..d8622bff6b8981a92db5cfc1b8325ce0b9519e79 100644 (file)
--- a/src/lib/fs/conffile.c
+++ b/src/lib/fs/conffile.c
@@ -17,7 +17,7 @@
 #include "lib/fs/dir.h"
 #include "lib/fs/files.h"
 #include "lib/fs/path.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/malloc/malloc.h"
 #include "lib/string/printf.h"
 

diff --git a/src/lib/fs/dir.c b/src/lib/fs/dir.c
index 0f2a5e2359a27b6a6b3420f8dba626b7b627eb2c..6c2446000539facddc4067a2141370620dee56ee 100644 (file)
--- a/src/lib/fs/dir.c
+++ b/src/lib/fs/dir.c
@@ -14,7 +14,7 @@
 #include "lib/fs/path.h"
 #include "lib/fs/userdb.h"
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/log/win32err.h"
 #include "lib/container/smartlist.h"

diff --git a/src/lib/fs/files.c b/src/lib/fs/files.c
index 9012fd64f2e7272ffbd62eebbe1a4b6bed1ee365..c71e4d2a37dafcaac0ed2bc513fc29a4b7bdc635 100644 (file)
--- a/src/lib/fs/files.c
+++ b/src/lib/fs/files.c
@@ -16,7 +16,7 @@
 #include "lib/fs/files.h"
 #include "lib/fs/path.h"
 #include "lib/container/smartlist.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/log/escape.h"
 #include "lib/err/torerr.h"

diff --git a/src/lib/fs/lockfile.c b/src/lib/fs/lockfile.c
index a4e3c427dbc10897e57fef94e347a20bbc5787ea..ca1711c3448da6bd8f5549e332df36b653aa8df6 100644 (file)
--- a/src/lib/fs/lockfile.c
+++ b/src/lib/fs/lockfile.c
@@ -13,7 +13,7 @@
 #include "orconfig.h"
 #include "lib/fs/files.h"
 #include "lib/fs/lockfile.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/malloc/malloc.h"
 

diff --git a/src/lib/fs/mmap.c b/src/lib/fs/mmap.c
index 7d91945bb9d25a7fbc44b64821a03c692633770b..e7da6fc63a417d5665ac5281f0627388d36c708e 100644 (file)
--- a/src/lib/fs/mmap.c
+++ b/src/lib/fs/mmap.c
@@ -11,7 +11,7 @@
 
 #include "lib/fs/mmap.h"
 #include "lib/fs/files.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/log/win32err.h"
 #include "lib/string/compat_string.h"

diff --git a/src/lib/fs/path.c b/src/lib/fs/path.c
index 9b32b2ebd3d9a6f0dd2dc7961af6d19f76f3e3fb..eb5170920cdb8ad186432ba4b12626595dc35708 100644 (file)
--- a/src/lib/fs/path.c
+++ b/src/lib/fs/path.c
@@ -11,7 +11,7 @@
 
 #include "lib/fs/path.h"
 #include "lib/malloc/malloc.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/string/printf.h"
 #include "lib/string/util_string.h"

diff --git a/src/lib/fs/storagedir.c b/src/lib/fs/storagedir.c
index 4db56b02f86d286c4456a7d58cebc5bb77ab150c..014eb4d9ebf9ab6dd13f31c82982c1dfd3d2e7d6 100644 (file)
--- a/src/lib/fs/storagedir.c
+++ b/src/lib/fs/storagedir.c
@@ -20,7 +20,7 @@
 #include "lib/fs/files.h"
 #include "lib/fs/mmap.h"
 #include "lib/log/escape.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/malloc/malloc.h"
 #include "lib/memarea/memarea.h"

diff --git a/src/lib/fs/userdb.c b/src/lib/fs/userdb.c
index 1e772b8fbd2c4c921a75eb4949309b7c29248b5b..df2935baa848b2039e027a23d8a9a5bdc46eae0c 100644 (file)
--- a/src/lib/fs/userdb.c
+++ b/src/lib/fs/userdb.c
@@ -13,7 +13,7 @@
 
 #ifndef _WIN32
 #include "lib/malloc/malloc.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 
 #include <pwd.h>

diff --git a/src/lib/log/include.am b/src/lib/log/include.am
index f0491b3863ab8561567135c50c1751355d798ca2..b5a1c5ca26eab12b92f21a270f37778de4608257 100644 (file)
--- a/src/lib/log/include.am
+++ b/src/lib/log/include.am
@@ -8,7 +8,7 @@ endif
 src_lib_libtor_log_a_SOURCES =                 \
        src/lib/log/escape.c                    \
        src/lib/log/ratelim.c                   \
-       src/lib/log/torlog.c                    \
+       src/lib/log/log.c                       \
        src/lib/log/util_bug.c
 
 if WIN32
@@ -26,6 +26,6 @@ src/lib/log/torlog.$(OBJEXT) \
 noinst_HEADERS +=                                      \
        src/lib/log/escape.h                            \
        src/lib/log/ratelim.h                           \
-       src/lib/log/torlog.h                            \
+       src/lib/log/log.h                               \
        src/lib/log/util_bug.h                          \
        src/lib/log/win32err.h

diff --git a/src/lib/log/torlog.c b/src/lib/log/log.c
similarity index 99%
rename from src/lib/log/torlog.c
rename to src/lib/log/log.c
index 46d121755408030a03bafb588fbe0c0f06b45dfa..b89747d84488fc85368dabdd789548e2813c7e57 100644 (file)
--- a/src/lib/log/torlog.c
+++ b/src/lib/log/log.c
@@ -5,7 +5,7 @@
 /* See LICENSE for licensing information */
 
 /**
- * \file torlog.c
+ * \file log.c
  * \brief Functions to send messages to log files or the console.
  **/
 
@@ -31,7 +31,7 @@
 #endif
 
 #define LOG_PRIVATE
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/ratelim.h"
 #include "lib/lock/compat_mutex.h"
 #include "lib/smartlist_core/smartlist_core.h"

diff --git a/src/lib/log/torlog.h b/src/lib/log/log.h
similarity index 99%
rename from src/lib/log/torlog.h
rename to src/lib/log/log.h
index c24b638191ec6ed7f6623076c9957ed1cd47961d..493409756f24e2901176681a69dfe4fff4438af9 100644 (file)
--- a/src/lib/log/torlog.h
+++ b/src/lib/log/log.h
@@ -5,7 +5,7 @@
 /* See LICENSE for licensing information */
 
 /**
- * \file torlog.h
+ * \file log.h
  *
  * \brief Headers for log.c
  **/

diff --git a/src/lib/log/util_bug.c b/src/lib/log/util_bug.c
index e3c8df0d6474cd3cfc7a4cc84a49b5565d105db9..42b3670a712833f5ad42da8caf93367bf1ca8b81 100644 (file)
--- a/src/lib/log/util_bug.c
+++ b/src/lib/log/util_bug.c
@@ -9,7 +9,7 @@
 
 #include "orconfig.h"
 #include "lib/log/util_bug.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/err/backtrace.h"
 #ifdef TOR_UNIT_TESTS
 #include "lib/smartlist_core/smartlist_core.h"

diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h
index a0753c807bbed67ea340b40851a1b59be497872a..61ee60f72957df03af926b336f5124a1418e881a 100644 (file)
--- a/src/lib/log/util_bug.h
+++ b/src/lib/log/util_bug.h
@@ -38,7 +38,7 @@
 
 #include "orconfig.h"
 #include "lib/cc/compat_compiler.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/testsupport/testsupport.h"
 
 /* Replace assert() with a variant that sends failures to the log before

diff --git a/src/lib/memarea/memarea.c b/src/lib/memarea/memarea.c
index 3a93d89ee27c133a4d42e1d2c600c2050889b2bb..dd7c48c079e818bdc937ac75d650af39c23dbe5a 100644 (file)
--- a/src/lib/memarea/memarea.c
+++ b/src/lib/memarea/memarea.c
@@ -17,7 +17,7 @@
 #include "lib/arch/bytes.h"
 #include "lib/cc/torint.h"
 #include "lib/container/smartlist.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/malloc/malloc.h"
 

diff --git a/src/lib/meminfo/meminfo.c b/src/lib/meminfo/meminfo.c
index 01080367fa35120d28fcdbd6cf9858ffb70521ae..648f54e0c5a4d6628d467dcf4c0a32c28709bdb6 100644 (file)
--- a/src/lib/meminfo/meminfo.c
+++ b/src/lib/meminfo/meminfo.c
@@ -15,7 +15,7 @@
 #include "lib/cc/compat_compiler.h"
 #include "lib/cc/torint.h"
 #include "lib/fs/files.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/malloc/malloc.h"
 
 #ifdef HAVE_SYS_SYSCTL_H

diff --git a/src/lib/net/address.c b/src/lib/net/address.c
index ca0c2a46c4e218c1621e56e5fbc022c83c0e358e..619fa13e9be7a1db09ce0b3f0010a6dff826589e 100644 (file)
--- a/src/lib/net/address.c
+++ b/src/lib/net/address.c
@@ -42,7 +42,7 @@
 #include "lib/net/socket.h"
 #include "lib/container/smartlist.h"
 #include "lib/ctime/di_ops.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/escape.h"
 #include "lib/malloc/malloc.h"
 #include "lib/net/inaddr.h"

diff --git a/src/lib/net/buffers_net.c b/src/lib/net/buffers_net.c
index 2e6a096a06f4d608a293c4690fe23310d46bae46..c52ea2784e78e87066e5ae18568dd8833b3955c8 100644 (file)
--- a/src/lib/net/buffers_net.c
+++ b/src/lib/net/buffers_net.c
@@ -12,7 +12,7 @@
 #define BUFFERS_PRIVATE
 #include "lib/net/buffers_net.h"
 #include "lib/container/buffers.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/net/nettypes.h"
 

diff --git a/src/lib/net/socket.c b/src/lib/net/socket.c
index 1b3238d9980791b688dad0d3685c80219eaf18d2..5847bb8734f7d07b3dccf441b2e7c3c14c6dfac7 100644 (file)
--- a/src/lib/net/socket.c
+++ b/src/lib/net/socket.c
@@ -15,7 +15,7 @@
 #include "lib/cc/compat_compiler.h"
 #include "lib/err/torerr.h"
 #include "lib/lock/compat_mutex.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 
 #ifdef _WIN32

diff --git a/src/lib/process/daemon.c b/src/lib/process/daemon.c
index 6863d05d7e04f85d7b792d9455fa34822d271759..671579838e1232e65f53cdfc83de36d3329c588a 100644 (file)
--- a/src/lib/process/daemon.c
+++ b/src/lib/process/daemon.c
@@ -14,7 +14,7 @@
 #ifndef _WIN32
 
 #include "lib/fs/files.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/thread/threads.h"
 
 #ifdef HAVE_SYS_TYPES_H

diff --git a/src/lib/process/env.c b/src/lib/process/env.c
index 5b959d05f8d84815bd888d8f7ea8978f2cfefb3b..dc0b63b499e5f7c46020408ba2d68a66da694beb 100644 (file)
--- a/src/lib/process/env.c
+++ b/src/lib/process/env.c
@@ -15,7 +15,7 @@
 #include "lib/ctime/di_ops.h"
 #include "lib/container/smartlist.h"
 #include "lib/log/util_bug.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/malloc/malloc.h"
 
 #ifdef HAVE_UNISTD_H

diff --git a/src/lib/process/pidfile.c b/src/lib/process/pidfile.c
index 17ff8be600aef07168134b5ab78b7a6ffe257386..ea008168abdc1332825b9e47b438f5b444d73c4c 100644 (file)
--- a/src/lib/process/pidfile.c
+++ b/src/lib/process/pidfile.c
@@ -11,7 +11,7 @@
 #include "orconfig.h"
 #include "lib/process/pidfile.h"
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>

diff --git a/src/lib/process/restrict.c b/src/lib/process/restrict.c
index fc1a308806d19b4edb94c2d2b3fc5fd1ad248a25..bca325e5bc49bf7d59c250aa94e48695404bf1f0 100644 (file)
--- a/src/lib/process/restrict.c
+++ b/src/lib/process/restrict.c
@@ -11,7 +11,7 @@
 #include "orconfig.h"
 #include "lib/process/restrict.h"
 #include "lib/intmath/cmp.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/net/socket.h"
 

diff --git a/src/lib/process/setuid.c b/src/lib/process/setuid.c
index 13b352dad0a67c291aca2c0dd7b46b14f03f51ca..d038039ff4d8b5e2d6a5d907aa640fa3e881e4fc 100644 (file)
--- a/src/lib/process/setuid.c
+++ b/src/lib/process/setuid.c
@@ -17,7 +17,7 @@
 
 #include "lib/container/smartlist.h"
 #include "lib/fs/userdb.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/malloc/malloc.h"
 

diff --git a/src/lib/process/subprocess.c b/src/lib/process/subprocess.c
index d2bbb61c343f551ebef1556174626eb92894cc62..70851c15e0acee0518a0f58652ad5b9370bc1fdf 100644 (file)
--- a/src/lib/process/subprocess.c
+++ b/src/lib/process/subprocess.c
@@ -13,7 +13,7 @@
 
 #include "lib/container/smartlist.h"
 #include "lib/err/torerr.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/log/win32err.h"
 #include "lib/malloc/malloc.h"

diff --git a/src/lib/process/waitpid.c b/src/lib/process/waitpid.c
index b829cb1b094287bf92aad1273e6b9f1e890b9628..32ba4530dac86b9f92b45d613ff2ded9e7544379 100644 (file)
--- a/src/lib/process/waitpid.c
+++ b/src/lib/process/waitpid.c
@@ -13,7 +13,7 @@
 #ifndef _WIN32
 
 #include "lib/process/waitpid.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/malloc/malloc.h"
 #include "ht.h"

diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c
index 7768bee06e218daddb4c9fd4aec8aaab55a4e54f..551075432710978d49a29b93ac8548585a4dbf69 100644 (file)
--- a/src/lib/sandbox/sandbox.c
+++ b/src/lib/sandbox/sandbox.c
@@ -36,7 +36,7 @@
 #include "lib/sandbox/sandbox.h"
 #include "lib/container/map.h"
 #include "lib/err/torerr.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/cc/torint.h"
 #include "lib/net/resolve.h"
 #include "lib/malloc/malloc.h"

diff --git a/src/lib/thread/compat_pthreads.c b/src/lib/thread/compat_pthreads.c
index 246c6254bb6c9712e623630ac29823ba995310a8..934067e4c1307866bda2e500a17ec76b2cb53620 100644 (file)
--- a/src/lib/thread/compat_pthreads.c
+++ b/src/lib/thread/compat_pthreads.c
@@ -12,7 +12,7 @@
 
 #include "orconfig.h"
 #include "lib/thread/threads.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 
 #include <sys/time.h>

diff --git a/src/lib/thread/compat_threads.c b/src/lib/thread/compat_threads.c
index 972960e242441e0d44df4ff02098718ce83bbf45..24129946b2b532584c8faec4e4d15361f1ff0ade 100644 (file)
--- a/src/lib/thread/compat_threads.c
+++ b/src/lib/thread/compat_threads.c
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include "lib/thread/threads.h"
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 
 #include <string.h>

diff --git a/src/lib/thread/compat_winthreads.c b/src/lib/thread/compat_winthreads.c
index 7f9877d21e084ca5592c48a03579856dc5b0f591..799eeda1b4bbf589439d656dd7571ed18838742f 100644 (file)
--- a/src/lib/thread/compat_winthreads.c
+++ b/src/lib/thread/compat_winthreads.c
@@ -15,7 +15,7 @@
 #include <windows.h>
 #include <process.h>
 #include "lib/thread/threads.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/log/win32err.h"
 

diff --git a/src/lib/thread/numcpus.c b/src/lib/thread/numcpus.c
index b8763f118f0c56420f7d7104eea233786094e363..cca15eb7aa0c7d24a880d6138799c2d55fb38ee4 100644 (file)
--- a/src/lib/thread/numcpus.c
+++ b/src/lib/thread/numcpus.c
@@ -10,7 +10,7 @@
 
 #include "orconfig.h"
 #include "lib/thread/numcpus.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 
 #ifdef HAVE_UNISTD_H

diff --git a/src/lib/time/compat_time.c b/src/lib/time/compat_time.c
index 2ea6eca988253c02631439994fd2ed1ff66c2e88..d26cb6880d9fff8f4a03e5c857de60ad2b32df67 100644 (file)
--- a/src/lib/time/compat_time.c
+++ b/src/lib/time/compat_time.c
@@ -13,7 +13,7 @@
 #include "lib/time/compat_time.h"
 
 #include "lib/err/torerr.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/intmath/muldiv.h"
 #include "lib/intmath/bits.h"

diff --git a/src/lib/time/tvdiff.c b/src/lib/time/tvdiff.c
index 6af12501c726ec81f20653467c6d951d6ef4561c..8617110e52a0cde50d12a90ba2cf0dca556f6a7f 100644 (file)
--- a/src/lib/time/tvdiff.c
+++ b/src/lib/time/tvdiff.c
@@ -11,7 +11,7 @@
 #include "lib/time/tvdiff.h"
 
 #include "lib/cc/compat_compiler.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 
 #ifdef _WIN32
 #include <winsock2.h>

diff --git a/src/lib/tls/buffers_tls.c b/src/lib/tls/buffers_tls.c
index 0e112b59cfec3ae090c954bb384e08d77983ce41..69ae4f7fc0d60d2dbbc27cf52a4874aa13ba43ab 100644 (file)
--- a/src/lib/tls/buffers_tls.c
+++ b/src/lib/tls/buffers_tls.c
@@ -15,7 +15,7 @@
 #include "lib/container/buffers.h"
 #include "lib/tls/buffers_tls.h"
 #include "lib/cc/torint.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/tls/tortls.h"
 

diff --git a/src/lib/tls/tortls.c b/src/lib/tls/tortls.c
index 1cd22a7eba4cd1a50869cf2fac8ef609e0871c90..073cae02ba14c717f49e5a329cf25484cce0b2c8 100644 (file)
--- a/src/lib/tls/tortls.c
+++ b/src/lib/tls/tortls.c
@@ -52,7 +52,7 @@ ENABLE_GCC_WARNING(redundant-decls)
 
 #define TORTLS_PRIVATE
 #include "lib/tls/tortls.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/container/smartlist.h"
 #include "lib/string/compat_string.h"

diff --git a/src/lib/trace/debug.h b/src/lib/trace/debug.h
index a764f552ea4184493fd7e8f7a509cb35575e0a40..191d94226dd60f03e37beda8adba42db26ba3f4f 100644 (file)
--- a/src/lib/trace/debug.h
+++ b/src/lib/trace/debug.h
@@ -9,7 +9,7 @@
 #ifndef TOR_TRACE_LOG_DEBUG_H
 #define TOR_TRACE_LOG_DEBUG_H
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 
 /* Stringify pre-processor trick. */
 #define XSTR(d) STR(d)

diff --git a/src/test/fuzz/fuzz_http.c b/src/test/fuzz/fuzz_http.c
index 61dc2144b4899c37132a6259b525ead5d5e61f79..2fbb2756144e7d950306ba6df6854366d7f5cca0 100644 (file)
--- a/src/test/fuzz/fuzz_http.c
+++ b/src/test/fuzz/fuzz_http.c
@@ -12,7 +12,7 @@
 #include "app/config/config.h"
 #include "core/mainloop/connection.h"
 #include "feature/dircache/directory.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 
 #include "feature/dircommon/dir_connection_st.h"
 

diff --git a/src/test/fuzz/fuzz_http_connect.c b/src/test/fuzz/fuzz_http_connect.c
index 184bb52ee263cc040708f0c437aa21c5088fea94..ca007a2c7f44472bbf3b1faf91db0c7256353fc2 100644 (file)
--- a/src/test/fuzz/fuzz_http_connect.c
+++ b/src/test/fuzz/fuzz_http_connect.c
@@ -13,7 +13,7 @@
 #include "core/mainloop/connection.h"
 #include "core/or/connection_edge.h"
 #include "core/proto/proto_socks.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 
 #include "core/or/entry_connection_st.h"
 #include "core/or/socks_request_st.h"

diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c
index e814555ba1ef34fd448e24b4c6c18626112bdc83..0d0f7574c35e17ffcd3e7756871bccfb8226b8f3 100644 (file)
--- 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 "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "test/log_test_helpers.h"
 
 /**

diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c
index 716cff36e042d0636e67bd524a6b14fb4b51c88f..89cbca2066169e86b89c747732d552cae8b49036 100644 (file)
--- a/src/test/test_bt_cl.c
+++ b/src/test/test_bt_cl.c
@@ -9,7 +9,7 @@
 #undef TOR_COVERAGE
 #include "core/or/or.h"
 #include "lib/err/backtrace.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/src/test/test_logging.c b/src/test/test_logging.c
index 2e3b8800ac9d24e37918da219741b64b5b867dfb..cd685a4af7ceaed80046fbe742b6ad0592cee597 100644 (file)
--- a/src/test/test_logging.c
+++ b/src/test/test_logging.c
@@ -7,7 +7,7 @@
 #include "core/or/or.h"
 #include "app/config/config.h"
 #include "lib/err/torerr.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "test/test.h"
 #include "lib/process/subprocess.h"
 

diff --git a/src/test/test_status.c b/src/test/test_status.c
index 3cc23955ad7c234e0e5355d142ab6aed7e4b7028..15c406d2ff4a563a4e03b738e67f26f241edf300 100644 (file)
--- a/src/test/test_status.c
+++ b/src/test/test_status.c
@@ -12,7 +12,7 @@
 #include <math.h>
 
 #include "core/or/or.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "tor_queue.h"
 #include "core/or/status.h"
 #include "core/or/circuitlist.h"

diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c
index 2b40ed72d9adbad66247442e19f269285063acce..54e5eca4f9616e7a18ebb6a825763d6fabb79939 100644 (file)
--- 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 "core/or/or.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "app/config/config.h"
 #include "lib/tls/tortls.h"
 #include "app/config/or_state_st.h"

diff --git a/src/test/test_util_slow.c b/src/test/test_util_slow.c
index 5021e89dff7e1f64afe13f9ac0d907db59fb037a..c5b24487b10a0bd0c992ba94ab2b26cc0d3363c5 100644 (file)
--- a/src/test/test_util_slow.c
+++ b/src/test/test_util_slow.c
@@ -7,7 +7,7 @@
 #define UTIL_PRIVATE
 #define SUBPROCESS_PRIVATE
 #include "lib/crypt_ops/crypto.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/process/subprocess.h"
 #include "lib/process/waitpid.h"
 #include "lib/string/printf.h"

diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c
index 0e3ab240838c9135d2155c13b01b0d6ff0d6ffbd..ff924152a6b9deb896ba551130f6978ddc438fe2 100644 (file)
--- a/src/tools/tor-gencert.c
+++ b/src/tools/tor-gencert.c
@@ -38,7 +38,7 @@ ENABLE_GCC_WARNING(redundant-decls)
 #include "lib/encoding/binascii.h"
 #include "lib/encoding/time_fmt.h"
 #include "lib/fs/files.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/malloc/malloc.h"
 #include "lib/net/address.h"
 #include "lib/net/inaddr.h"

diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index a4d5184b4ab9f8761ef24bd378d3aedf5b7b8fc1..d5b49878324f9338fdc6b56b3b8ff1516fc069d6 100644 (file)
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -6,7 +6,7 @@
 #include "orconfig.h"
 
 #include "lib/arch/bytes.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/malloc/malloc.h"
 #include "lib/net/address.h"
 #include "lib/net/resolve.h"