[tor-commits] [tor/master] Stop using util.h and compat.h in src/trunnel/

[nickm at torproject.org]

commit 077176a34c54929580a0178ce6667ae180c352d1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 29 11:42:34 2018 -0400

    Stop using util.h and compat.h in src/trunnel/
---
 src/trunnel/trunnel-local.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/trunnel/trunnel-local.h b/src/trunnel/trunnel-local.h
index df852acb1..e81396aee 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