diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-24 10:56:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-24 10:56:50 -0400 |
| commit | 78295904f7422c056b5c61b31b512c6d5e2a225e (patch) | |
| tree | 1a1ad70b882406b49141cebb97d5ffd266c665f0 /src/core/mainloop | |
| parent | ae0cb94b69b65e4561932b668deb0b19a19dbe94 (diff) | |
| parent | 7ed7fe230bf4295de73c22b0f7649f7372b4c782 (diff) | |
| download | tor-78295904f7422c056b5c61b31b512c6d5e2a225e.tar.gz tor-78295904f7422c056b5c61b31b512c6d5e2a225e.zip | |
Merge branch 'ticket26744'
Diffstat (limited to 'src/core/mainloop')
| -rw-r--r-- | src/core/mainloop/connection.c | 2 | ||||
| -rw-r--r-- | src/core/mainloop/mainloop.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index f85a2b61d5..4231bec014 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -77,7 +77,7 @@ #include "core/or/connection_or.h" #include "feature/control/control.h" #include "lib/crypt_ops/crypto_util.h" -#include "feature/dircache/directory.h" +#include "feature/dircommon/directory.h" #include "feature/dircache/dirserv.h" #include "feature/relay/dns.h" #include "feature/client/dnsserv.h" diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index 4e13090948..06d6de9a27 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -68,7 +68,7 @@ #include "feature/control/control.h" #include "core/mainloop/cpuworker.h" #include "lib/crypt_ops/crypto_rand.h" -#include "feature/dircache/directory.h" +#include "feature/dircommon/directory.h" #include "feature/dircache/dirserv.h" #include "feature/dirauth/reachability.h" #include "feature/relay/dns.h" |