Merge branch 'post-refactor-renaming'

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"
 

src/core/or/or.h

@@ -47,7 +47,7 @@
 #include "lib/log/escape.h"
 #include "lib/log/ratelim.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/net/address.h"
 #include "lib/net/inaddr.h"
 #include "lib/net/socket.h"

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"

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"

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"
 

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"
@@ -32,7 +32,7 @@
 #include "lib/compress/compress_zlib.h"
 #include "lib/compress/compress_zstd.h"
 #include "lib/intmath/cmp.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/thread/threads.h"
 
 /** Total number of bytes allocated for compression state overhead. */

src/lib/compress/compress_lzma.c

@@ -15,9 +15,9 @@
 
 #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/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/thread/threads.h"
 
 #ifdef HAVE_LZMA

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"

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"

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"

src/lib/container/bitarray.h

@@ -15,7 +15,7 @@
 #include "orconfig.h"
 #include <string.h>
 #include "lib/cc/torint.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #if SIZEOF_INT == 4
 #define BITARRAY_SHIFT 5

src/lib/container/bloomfilt.c

@@ -10,7 +10,7 @@
 
 #include <stdlib.h>
 
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/container/bloomfilt.h"
 #include "lib/intmath/bits.h"
 #include "lib/log/util_bug.h"

src/lib/container/buffers.c

@@ -27,10 +27,10 @@
 #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/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/printf.h"
 #include "lib/time/compat_time.h"
 

src/lib/container/handles.h

@@ -52,7 +52,7 @@
 #include "orconfig.h"
 
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #define HANDLE_ENTRY(name, structname)         \
   struct name ## _handle_head_t *handle_head

src/lib/container/map.c

@@ -14,7 +14,7 @@
 #include "lib/ctime/di_ops.h"
 #include "lib/defs/digest_sizes.h"
 #include "lib/string/util_string.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #include "lib/log/util_bug.h"
 

src/lib/container/smartlist.c

@@ -17,7 +17,7 @@
 
 #include "lib/container/smartlist.h"
 #include "lib/err/torerr.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/defs/digest_sizes.h"
 #include "lib/ctime/di_ops.h"
 #include "lib/string/compat_ctype.h"

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

src/lib/crypt_ops/aes.h

@@ -14,7 +14,7 @@
  */
 
 #include "lib/cc/torint.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 typedef struct aes_cnt_cipher aes_cnt_cipher_t;
 

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"

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"

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)

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"

src/lib/crypt_ops/crypto_digest.h

@@ -15,7 +15,7 @@
 
 #include "lib/cc/torint.h"
 #include "lib/defs/digest_sizes.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 /** Length of a sha1 message digest when encoded in base32 with trailing =
  * signs removed. */

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"

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"
 

src/lib/crypt_ops/crypto_rand.c

@@ -26,9 +26,9 @@
 #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/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/sandbox/sandbox.h"
 #include "lib/string/compat_string.h"
 #include "lib/string/util_string.h"

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>

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)

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

src/lib/ctime/di_ops.c

@@ -9,7 +9,7 @@
 #include "orconfig.h"
 #include "lib/ctime/di_ops.h"
 #include "lib/err/torerr.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #include <string.h>
 

src/lib/encoding/binascii.c

@@ -14,12 +14,12 @@
 #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"
 #include "lib/intmath/muldiv.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #include <stddef.h>
 #include <string.h>

src/lib/encoding/confline.c

@@ -17,9 +17,9 @@
 
 #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/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/compat_ctype.h"
 #include "lib/string/compat_string.h"
 #include "lib/string/util_string.h"

src/lib/encoding/cstring.c

@@ -11,9 +11,9 @@
  **/
 
 #include "lib/encoding/cstring.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/compat_ctype.h"
 
 #include <string.h>

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>

src/lib/encoding/time_fmt.c

@@ -15,13 +15,13 @@
  **/
 
 #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/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/printf.h"
 #include "lib/string/scanf.h"
-#include "lib/wallclock/tm_cvt.h"
+#include "lib/wallclock/time_to_tm.h"
 
 #include <string.h>
 #include <time.h>

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"
 

src/lib/evloop/compat_libevent.h

@@ -11,7 +11,7 @@
 
 #include "orconfig.h"
 #include "lib/testsupport/testsupport.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 void configure_libevent_logging(void);
 void suppress_libevent_log_msg(const char *msg);

src/lib/evloop/procmon.c

@@ -8,10 +8,10 @@
 
 #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/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/parse_int.h"
 
 #ifdef HAVE_SIGNAL_H

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;
 

src/lib/evloop/timers.c

@@ -34,9 +34,9 @@
 #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/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/time/compat_time.h"
 
 #ifdef _WIN32

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"

src/lib/fs/conffile.c

@@ -17,8 +17,8 @@
 #include "lib/fs/dir.h"
 #include "lib/fs/files.h"
 #include "lib/fs/path.h"
-#include "lib/log/torlog.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/log/log.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/printf.h"
 
 static smartlist_t *config_get_file_list(const char *path,

src/lib/fs/dir.c

@@ -14,12 +14,12 @@
 #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"
 #include "lib/sandbox/sandbox.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/printf.h"
 #include "lib/string/compat_string.h"
 

src/lib/fs/files.c

@@ -16,11 +16,11 @@
 #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"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/sandbox/sandbox.h"
 #include "lib/string/printf.h"
 #include "lib/string/util_string.h"

src/lib/fs/lockfile.c

@@ -13,9 +13,9 @@
 #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/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>

src/lib/fs/mmap.c

@@ -11,11 +11,11 @@
 
 #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"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #ifdef HAVE_MMAP
 #include <sys/mman.h>

src/lib/fs/path.c

@@ -10,8 +10,8 @@
  **/
 
 #include "lib/fs/path.h"
-#include "lib/malloc/util_malloc.h"
-#include "lib/log/torlog.h"
+#include "lib/malloc/malloc.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/string/printf.h"
 #include "lib/string/util_string.h"

src/lib/fs/storagedir.c

@@ -20,9 +20,9 @@
 #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/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/memarea/memarea.h"
 #include "lib/sandbox/sandbox.h"
 #include "lib/string/printf.h"

src/lib/fs/userdb.c

@@ -12,8 +12,8 @@
 #include "lib/fs/userdb.h"
 
 #ifndef _WIN32
-#include "lib/malloc/util_malloc.h"
-#include "lib/log/torlog.h"
+#include "lib/malloc/malloc.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 
 #include <pwd.h>

src/lib/lock/compat_mutex.c

@@ -10,7 +10,7 @@
  **/
 
 #include "lib/lock/compat_mutex.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 /** Return a newly allocated, ready-for-use mutex. */
 tor_mutex_t *

src/lib/lock/compat_mutex.h

@@ -14,7 +14,7 @@
 
 #include "orconfig.h"
 #include "lib/cc/torint.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #if defined(HAVE_PTHREAD_H) && !defined(_WIN32)
 #include <pthread.h>

src/lib/log/escape.c

@@ -12,7 +12,7 @@
 #include "lib/log/util_bug.h"
 #include "lib/string/compat_ctype.h"
 #include "lib/string/printf.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 /** Allocate and return a new string representing the contents of <b>s</b>,
  * surrounded by quotes and using standard C escapes.

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

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"
@@ -41,11 +41,11 @@
 #include "lib/intmath/bits.h"
 #include "lib/string/compat_string.h"
 #include "lib/string/printf.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/util_string.h"
 #include "lib/wallclock/tor_gettimeofday.h"
 #include "lib/wallclock/approx_time.h"
-#include "lib/wallclock/tm_cvt.h"
+#include "lib/wallclock/time_to_tm.h"
 #include "lib/fdio/fdio.h"
 
 #ifdef HAVE_ANDROID_LOG_H

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

src/lib/log/ratelim.c

@@ -9,7 +9,7 @@
  **/
 
 #include "lib/log/ratelim.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/printf.h"
 
 /** If the rate-limiter <b>lim</b> is ready at <b>now</b>, return the number

src/lib/log/util_bug.c

@@ -9,13 +9,13 @@
 
 #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"
 #include "lib/smartlist_core/smartlist_foreach.h"
 #endif
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/printf.h"
 
 #include <string.h>

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

src/lib/log/win32err.c

@@ -11,7 +11,7 @@
 #ifdef _WIN32
 #include "orconfig.h"
 #include "lib/log/win32err.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #include <tchar.h>
 #include <windows.h>

src/lib/malloc/include.am

@@ -6,7 +6,7 @@ noinst_LIBRARIES += src/lib/libtor-malloc-testing.a
 endif
 
 src_lib_libtor_malloc_a_SOURCES =			\
-	src/lib/malloc/util_malloc.c
+	src/lib/malloc/malloc.c
 
 if USE_OPENBSD_MALLOC
 src_lib_libtor_malloc_a_SOURCES += src/ext/OpenBSD_malloc_Linux.c
@@ -18,4 +18,4 @@ src_lib_libtor_malloc_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
 src_lib_libtor_malloc_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 
 noinst_HEADERS +=					\
-	src/lib/malloc/util_malloc.h
+	src/lib/malloc/malloc.h

src/lib/malloc/malloc.c

@@ -4,7 +4,7 @@
 /* See LICENSE for licensing information */
 
 /**
- * \file util_malloc.c
+ * \file malloc.c
  * \brief Wrappers for C malloc code, and replacements for items that
  *   may be missing.
  **/
@@ -16,7 +16,7 @@
 
 #include "lib/testsupport/testsupport.h"
 #define UTIL_MALLOC_PRIVATE
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/cc/torint.h"
 #include "lib/err/torerr.h"
 

src/lib/malloc/malloc.h

@@ -4,7 +4,7 @@
 /* See LICENSE for licensing information */
 
 /**
- * \file util_malloc.h
+ * \file malloc.h
  * \brief Headers for util_malloc.c
  **/
 

src/lib/memarea/memarea.c

@@ -17,9 +17,9 @@
 #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/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #ifndef DISABLE_MEMORY_SENTINELS
 

src/lib/meminfo/meminfo.c

@@ -15,8 +15,8 @@
 #include "lib/cc/compat_compiler.h"
 #include "lib/cc/torint.h"
 #include "lib/fs/files.h"
-#include "lib/log/torlog.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/log/log.h"
+#include "lib/malloc/malloc.h"
 
 #ifdef HAVE_SYS_SYSCTL_H
 #include <sys/sysctl.h>

src/lib/net/address.c

@@ -42,9 +42,9 @@
 #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/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/net/inaddr.h"
 #include "lib/string/compat_ctype.h"
 #include "lib/string/compat_string.h"

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"
 

src/lib/net/resolve.c

@@ -12,7 +12,7 @@
 
 #include "lib/net/address.h"
 #include "lib/net/inaddr.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/parse_int.h"
 #include "lib/string/util_string.h"
 

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

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

src/lib/process/env.c

@@ -11,12 +11,12 @@
 #include "orconfig.h"
 #include "lib/process/env.h"
 
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/ctime/di_ops.h"
 #include "lib/container/smartlist.h"
 #include "lib/log/util_bug.h"
-#include "lib/log/torlog.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/log/log.h"
+#include "lib/malloc/malloc.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

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>

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"
 

src/lib/process/setuid.c

@@ -17,9 +17,9 @@
 
 #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/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>

src/lib/process/subprocess.c

@@ -13,10 +13,10 @@
 
 #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/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/process/env.h"
 #include "lib/process/waitpid.h"
 #include "lib/string/compat_ctype.h"

src/lib/process/waitpid.c

@@ -13,9 +13,9 @@
 #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/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "ht.h"
 
 #ifdef HAVE_SYS_WAIT_H

src/lib/sandbox/sandbox.c

@@ -36,10 +36,10 @@
 #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/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/scanf.h"
 
 #include "tor_queue.h"

src/lib/smartlist_core/smartlist_core.c

@@ -11,7 +11,7 @@
  **/
 
 #include "lib/err/torerr.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/smartlist_core/smartlist_core.h"
 
 #include <stdlib.h>

src/lib/smartlist_core/smartlist_split.c

@@ -14,7 +14,7 @@
 #include "lib/err/torerr.h"
 #include "lib/string/util_string.h"
 #include "lib/string/compat_ctype.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #include <string.h>
 

src/lib/string/printf.c

@@ -11,7 +11,7 @@
 #include "lib/string/printf.h"
 #include "lib/err/torerr.h"
 #include "lib/cc/torint.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #include <stdlib.h>
 #include <stdio.h>

src/lib/term/getpass.c

@@ -11,7 +11,7 @@
 #include "lib/term/getpass.h"
 
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #ifdef _WIN32
 #include <windows.h>

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>

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>

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"
 

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

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"

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>

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"
 

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"

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)

src/lib/wallclock/include.am

@@ -7,7 +7,7 @@ endif
 
 src_lib_libtor_wallclock_a_SOURCES =			\
 	src/lib/wallclock/approx_time.c			\
-	src/lib/wallclock/tm_cvt.c			\
+	src/lib/wallclock/time_to_tm.c			\
 	src/lib/wallclock/tor_gettimeofday.c
 
 src_lib_libtor_wallclock_testing_a_SOURCES = \
@@ -18,5 +18,5 @@ src_lib_libtor_wallclock_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 noinst_HEADERS +=					\
 	src/lib/wallclock/approx_time.h			\
 	src/lib/wallclock/timeval.h			\
-	src/lib/wallclock/tm_cvt.h			\
+	src/lib/wallclock/time_to_tm.h			\
 	src/lib/wallclock/tor_gettimeofday.h

src/lib/wallclock/time_to_tm.c

@@ -4,14 +4,14 @@
 /* See LICENSE for licensing information */
 
 /**
- * \file tm_cvt.c
- * \brief Convert to and from struct tm, portably.
+ * \file time_to_tm.c
+ * \brief Convert to struct tm, portably.
  **/
 
 #include "orconfig.h"
 #include "lib/cc/torint.h"
 #include "lib/cc/compat_compiler.h"
-#include "lib/wallclock/tm_cvt.h"
+#include "lib/wallclock/time_to_tm.h"
 #include "lib/string/printf.h"
 #include "lib/err/torerr.h"
 

src/lib/wallclock/time_to_tm.h

@@ -4,12 +4,12 @@
 /* See LICENSE for licensing information */
 
 /**
- * \file tm_cvt.h
- * \brief Header for tm_cvt.c
+ * \file time_to_tm.h
+ * \brief Header for time_to_tm.c
  **/
 
-#ifndef TOR_WALLCLOCK_TM_CVT_H
-#define TOR_WALLCLOCK_TM_CVT_H
+#ifndef TOR_WALLCLOCK_TIME_TO_TM_H
+#define TOR_WALLCLOCK_TIME_TO_TM_H
 
 #include <sys/types.h>
 

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"
 

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"

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

src/test/test-memwipe.c

@@ -5,7 +5,7 @@
 #include "lib/crypt_ops/crypto_util.h"
 
 #include "lib/intmath/cmp.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #include <string.h>
 #include <stdio.h>

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>

src/test/test_crypto_openssl.c

@@ -10,7 +10,7 @@
 #include "lib/crypt_ops/compat_openssl.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/encoding/binascii.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "test/test.h"
 
 #include <openssl/evp.h>

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"
 

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"