Commit c08b7b10 authored by Nick Mathewson's avatar Nick Mathewson
Browse files

Merge branch 'post-refactor-renaming'

parents 9ec80909 b6d0e7ca
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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. */
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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;
......
......@@ -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"
......
......@@ -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"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment