commit 9e65e7a36f6f7b18164d0e76fe25f0c32b31aaec Merge: 09223ad83 316453065 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 27 16:26:06 2018 -0400

Merge branch 'split_stats'

.gitignore | 2 + Makefile.am | 2 + changes/ticket27892 | 3 + src/app/config/config.c | 28 +- src/app/main/main.c | 6 +- src/core/include.am | 12 +- src/core/mainloop/connection.c | 2 +- src/core/mainloop/mainloop.c | 3 +- src/core/or/channel.c | 23 +- src/core/or/circuitbuild.c | 2 +- src/core/or/circuitlist.c | 1 + src/core/or/circuituse.c | 2 +- src/core/or/connection_edge.c | 1 + src/core/or/connection_or.c | 2 +- src/core/or/dos.c | 10 +- src/core/or/or.h | 4 +- src/core/or/policies.c | 2 +- src/core/or/relay.c | 2 +- src/core/or/status.c | 2 +- src/feature/control/control.c | 5 +- src/feature/control/getinfo_geoip.c | 45 +++ src/feature/control/getinfo_geoip.h | 14 + src/feature/dircache/dircache.c | 2 +- src/feature/dircache/dirserv.c | 2 +- src/feature/dirclient/dirclient.c | 2 +- src/feature/dircommon/directory.c | 2 +- src/feature/nodelist/nodelist.c | 2 +- src/feature/nodelist/routerset.c | 2 +- src/feature/relay/router.c | 3 +- src/feature/rend/rendservice.c | 2 +- src/feature/stats/{geoip.c => geoip_stats.c} | 539 ++------------------------- src/feature/stats/{geoip.h => geoip_stats.h} | 30 +- src/feature/stats/predict_ports.c | 311 ++++++++++++++++ src/feature/stats/predict_ports.h | 30 ++ src/feature/stats/rephist.c | 309 +-------------- src/feature/stats/rephist.h | 14 - src/include.am | 1 + src/lib/geoip/.may_include | 13 + src/lib/geoip/country.h | 14 + src/lib/geoip/geoip.c | 510 +++++++++++++++++++++++++ src/lib/geoip/geoip.h | 50 +++ src/lib/geoip/include.am | 17 + src/test/test_config.c | 2 +- src/test/test_dir_handle_get.c | 3 +- src/test/test_dos.c | 3 +- src/test/test_geoip.c | 17 +- src/test/test_options.c | 2 +- src/test/test_routerset.c | 2 +- src/test/testing_common.c | 1 + 49 files changed, 1157 insertions(+), 901 deletions(-)