aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-28 13:57:23 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-28 14:40:25 -0400
commita742a826f6fe4eafef047c4dd7ca7fa899d2f823 (patch)
tree7c83b2c177eeac4630736ed010266e6bcd36ebb3 /src/or
parent0f02d2c0411448668d2dfe11b61e1ea72ee7a3b2 (diff)
downloadtor-a742a826f6fe4eafef047c4dd7ca7fa899d2f823.tar.gz
tor-a742a826f6fe4eafef047c4dd7ca7fa899d2f823.zip
Remove all include common/ uses in crypto_ops and tls.
Diffstat (limited to 'src/or')
-rw-r--r--src/or/or.h1
-rw-r--r--src/or/parsecommon.c5
2 files changed, 6 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index ebafc607f3..63349cffbb 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -83,6 +83,7 @@
#include "common/token_bucket.h"
#include "lib/encoding/binascii.h"
#include "or/hs_circuitmap.h"
+#include "common/util.h"
// These, more than other includes, are for keeping the other struct
// definitions working. We should remove them when we minimize our includes.
diff --git a/src/or/parsecommon.c b/src/or/parsecommon.c
index 3b6e15b0f3..7c9cf88f95 100644
--- a/src/or/parsecommon.c
+++ b/src/or/parsecommon.c
@@ -8,8 +8,13 @@
#include "or/parsecommon.h"
#include "lib/log/torlog.h"
+#include "lib/log/util_bug.h"
#include "lib/encoding/binascii.h"
#include "lib/container/smartlist.h"
+#include "lib/string/util_string.h"
+#include "lib/string/printf.h"
+
+#include <string.h>
#define MIN_ANNOTATION A_PURPOSE
#define MAX_ANNOTATION A_UNKNOWN_