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.

76 files changed, 78 insertions, 78 deletions

diff --git a/src/core/crypto/onion_ntor.c b/src/core/crypto/onion_ntor.c
index 9e1e273ef6..ea7261cb53 100644
--- 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 44e19985fa..fd281377df 100644
--- 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 4f1c3fd421..3aaf8ac501 100644
--- 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 172d4f9de3..a276082021 100644
--- 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 ff1aea47a4..2ad9b15b2e 100644
--- 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 9091832ed3..e6c8368f6a 100644
--- 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 9574c47a7e..a0e82d5a99 100644
--- 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 12e6727dee..64be1d4256 100644
--- 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 0a553db55c..0a71fed4b8 100644
--- 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 525747a4c9..87d782d7ef 100644
--- 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 a01b1e16b2..ff9d4d855c 100644
--- 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 48574016bf..5bc2da76ab 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 "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 09f492e544..6ad2587f48 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_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 c37e286daf..3e82996935 100644
--- 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 949e694053..ee5c362e38 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 "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 985652ecba..9d2c9e9fab 100644
--- 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 8c71b265bf..50916a8d68 100644
--- 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 e2d72a77c0..fb9d0c2c6c 100644
--- 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 9290414de0..5ec69d7319 100644
--- 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 093f2cec6c..51fc974821 100644
--- 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 19b0885256..79988c6a91 100644
--- 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 7499d64720..e9140d9432 100644
--- 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 9b17629537..dd5193d3a7 100644
--- 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 3e0db712f9..69aa7f3da5 100644
--- 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 53ee776fe7..d5e4e4e438 100644
--- 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 8ce15e7477..42b1cc646b 100644
--- 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 5e5faf163c..2ee71c5598 100644
--- 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 53c458f159..e0c26caab2 100644
--- 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 b596e5cc6d..42c3788692 100644
--- 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 4580b89e3c..c4e85c7c93 100644
--- 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 4d36f352e3..931f65e710 100644
--- 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 3a4d95f450..d8622bff6b 100644
--- 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 0f2a5e2359..6c24460005 100644
--- 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 9012fd64f2..c71e4d2a37 100644
--- 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 a4e3c427db..ca1711c344 100644
--- 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 7d91945bb9..e7da6fc63a 100644
--- 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 9b32b2ebd3..eb5170920c 100644
--- 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 4db56b02f8..014eb4d9eb 100644
--- 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 1e772b8fbd..df2935baa8 100644
--- 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 f0491b3863..b5a1c5ca26 100644
--- 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
index 46d1217554..b89747d844 100644
--- 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
index c24b638191..493409756f 100644
--- 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 e3c8df0d64..42b3670a71 100644
--- 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 a0753c807b..61ee60f729 100644
--- 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 3a93d89ee2..dd7c48c079 100644
--- 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 01080367fa..648f54e0c5 100644
--- 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 ca0c2a46c4..619fa13e9b 100644
--- 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 2e6a096a06..c52ea2784e 100644
--- 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 1b3238d998..5847bb8734 100644
--- 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 6863d05d7e..671579838e 100644
--- 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 5b959d05f8..dc0b63b499 100644
--- 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 17ff8be600..ea008168ab 100644
--- 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 fc1a308806..bca325e5bc 100644
--- 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 13b352dad0..d038039ff4 100644
--- 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 d2bbb61c34..70851c15e0 100644
--- 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 b829cb1b09..32ba4530da 100644
--- 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 7768bee06e..5510754327 100644
--- 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 246c6254bb..934067e4c1 100644
--- 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 972960e242..24129946b2 100644
--- 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 7f9877d21e..799eeda1b4 100644
--- 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 b8763f118f..cca15eb7aa 100644
--- 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 2ea6eca988..d26cb6880d 100644
--- 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 6af12501c7..8617110e52 100644
--- 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 0e112b59cf..69ae4f7fc0 100644
--- 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 1cd22a7eba..073cae02ba 100644
--- 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 a764f552ea..191d94226d 100644
--- 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 61dc2144b4..2fbb275614 100644
--- 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 184bb52ee2..ca007a2c7f 100644
--- 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 e814555ba1..0d0f7574c3 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 "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 716cff36e0..89cbca2066 100644
--- 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 2e3b8800ac..cd685a4af7 100644
--- 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 3cc23955ad..15c406d2ff 100644
--- 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 2b40ed72d9..54e5eca4f9 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 "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 5021e89dff..c5b24487b1 100644
--- 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 0e3ab24083..ff924152a6 100644
--- 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 a4d5184b4a..d5b4987832 100644
--- 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"