aboutsummaryrefslogtreecommitdiff
path: root/src/feature
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-07-10 15:20:28 -0400
committerNick Mathewson <nickm@torproject.org>2018-07-10 15:20:30 -0400
commite7f5f48d68553206b95cbb4f610702c887500124 (patch)
tree75cbf04d94e08c92d48f3518d506ec1166e862df /src/feature
parent41640b65735ec6214aa5080c2143b0982a59bb93 (diff)
downloadtor-e7f5f48d68553206b95cbb4f610702c887500124.tar.gz
tor-e7f5f48d68553206b95cbb4f610702c887500124.zip
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.
Diffstat (limited to 'src/feature')
-rw-r--r--src/feature/dirauth/keypin.c2
-rw-r--r--src/feature/nodelist/parsecommon.c2
-rw-r--r--src/feature/nodelist/torcert.c2
3 files changed, 3 insertions, 3 deletions
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"