diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-27 16:26:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-27 16:26:06 -0400 |
| commit | 9e65e7a36f6f7b18164d0e76fe25f0c32b31aaec (patch) | |
| tree | 5ea199db55c2a1f883e2417663c9dc46b3a1cd73 /src/core/mainloop | |
| parent | 09223ad83b09e75494863bacb3f8004c945ef015 (diff) | |
| parent | 316453065dfae10dde5afce15feafbdc5c8562a9 (diff) | |
| download | tor-9e65e7a36f6f7b18164d0e76fe25f0c32b31aaec.tar.gz tor-9e65e7a36f6f7b18164d0e76fe25f0c32b31aaec.zip | |
Merge branch 'split_stats'
Diffstat (limited to 'src/core/mainloop')
| -rw-r--r-- | src/core/mainloop/connection.c | 2 | ||||
| -rw-r--r-- | src/core/mainloop/mainloop.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 18863fc04f..d8326a5be8 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -102,7 +102,7 @@ #include "feature/relay/routermode.h" #include "feature/rend/rendclient.h" #include "feature/rend/rendcommon.h" -#include "feature/stats/geoip.h" +#include "lib/geoip/geoip.h" #include "feature/stats/rephist.h" #include "lib/crypt_ops/crypto_util.h" diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index 6e7033ec4b..6c305c2b47 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -92,7 +92,8 @@ #include "feature/relay/selftest.h" #include "feature/rend/rendcache.h" #include "feature/rend/rendservice.h" -#include "feature/stats/geoip.h" +#include "feature/stats/geoip_stats.h" +#include "feature/stats/predict_ports.h" #include "feature/stats/rephist.h" #include "lib/container/buffers.h" #include "lib/crypt_ops/crypto_rand.h" |