From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 29 Jun 2018 15:42:34 +0000 (-0400)
Subject: Stop using util.h and compat.h in src/trunnel/
X-Git-Tag: tor-0.3.5.1-alpha~290
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=077176a34c54929580a0178ce6667ae180c352d1;p=thirdparty%2Ftor.git

Stop using util.h and compat.h in src/trunnel/
---

diff --git a/src/trunnel/trunnel-local.h b/src/trunnel/trunnel-local.h
index df852acb19..e81396aeea 100644
--- a/src/trunnel/trunnel-local.h
+++ b/src/trunnel/trunnel-local.h
@@ -2,9 +2,9 @@
 #ifndef TRUNNEL_LOCAL_H_INCLUDED
 #define TRUNNEL_LOCAL_H_INCLUDED
 
-#include "common/util.h"
-#include "common/compat.h"
 #include "lib/crypt_ops/crypto_util.h"
+#include "lib/malloc/util_malloc.h"
+#include "lib/log/util_bug.h"
 
 #define trunnel_malloc tor_malloc
 #define trunnel_calloc tor_calloc