diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-06-26 11:27:33 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-06-26 11:27:33 -0400 |
commit | 92d8284a9792267514cbe21f3ce1564f6ad0e10b (patch) | |
tree | f4a82d867c9fb863f7a3f56a2baffb509a2af5c5 /src/common/address.c | |
parent | b4e23dba930cbb8168151e1fe9dcf280615d6f3b (diff) | |
parent | 1b93b065fc3eb52fe5674d6df05c71c505ed1ef3 (diff) | |
download | tor-92d8284a9792267514cbe21f3ce1564f6ad0e10b.tar.gz tor-92d8284a9792267514cbe21f3ce1564f6ad0e10b.zip |
Merge branch 'log_dependencies'
Diffstat (limited to 'src/common/address.c')
-rw-r--r-- | src/common/address.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/address.c b/src/common/address.c index f135f1ffd1..42052f85ec 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -39,9 +39,10 @@ #include "common/util.h" #include "common/util_format.h" #include "common/address.h" -#include "common/torlog.h" -#include "common/container.h" +#include "lib/log/torlog.h" +#include "lib/container/smartlist.h" #include "common/sandbox.h" +#include "siphash.h" #ifdef HAVE_SYS_TIME_H #include <sys/time.h> @@ -2169,4 +2170,3 @@ tor_addr_port_eq(const tor_addr_port_t *a, { return tor_addr_eq(&a->addr, &b->addr) && a->port == b->port; } - |