aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-27 15:59:07 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-27 16:18:42 -0400
commit235ddb15a0f9fc322002ba39e8900634316dc333 (patch)
tree8b18c9ff270a8f2413cab4fa9408b60dade0baf0 /src/or
parent3cff3e825a1478fc3350bbca16f091b8f635f921 (diff)
downloadtor-235ddb15a0f9fc322002ba39e8900634316dc333.tar.gz
tor-235ddb15a0f9fc322002ba39e8900634316dc333.zip
Move util_format into a new libtor-encoding library
libtor-encoding is about various ways to transform data to and from character sequences.
Diffstat (limited to 'src/or')
-rw-r--r--src/or/keypin.c2
-rw-r--r--src/or/or.h2
-rw-r--r--src/or/parsecommon.c2
-rw-r--r--src/or/shared_random_client.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/or/keypin.c b/src/or/keypin.c
index db267673f8..8e1ef099a4 100644
--- a/src/or/keypin.c
+++ b/src/or/keypin.c
@@ -22,7 +22,7 @@
#include "lib/log/torlog.h"
#include "lib/fdio/fdio.h"
#include "common/util.h"
-#include "common/util_format.h"
+#include "lib/encoding/binascii.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
diff --git a/src/or/or.h b/src/or/or.h
index a71cb6b00a..df0e60c262 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -81,7 +81,7 @@
#include "lib/crypt_ops/crypto_ed25519.h"
#include "tor_queue.h"
#include "common/token_bucket.h"
-#include "common/util_format.h"
+#include "lib/encoding/binascii.h"
#include "or/hs_circuitmap.h"
// These, more than other includes, are for keeping the other struct
diff --git a/src/or/parsecommon.c b/src/or/parsecommon.c
index 17a7c6a891..3b6e15b0f3 100644
--- a/src/or/parsecommon.c
+++ b/src/or/parsecommon.c
@@ -8,7 +8,7 @@
#include "or/parsecommon.h"
#include "lib/log/torlog.h"
-#include "common/util_format.h"
+#include "lib/encoding/binascii.h"
#include "lib/container/smartlist.h"
#define MIN_ANNOTATION A_PURPOSE
diff --git a/src/or/shared_random_client.c b/src/or/shared_random_client.c
index f0b13a171e..9a6c0f6644 100644
--- a/src/or/shared_random_client.c
+++ b/src/or/shared_random_client.c
@@ -15,7 +15,7 @@
#include "or/voting_schedule.h"
#include "or/networkstatus.h"
#include "common/util.h"
-#include "common/util_format.h"
+#include "lib/encoding/binascii.h"
#include "or/networkstatus_st.h"