diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-10-12 11:39:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-10-12 11:39:37 -0400 |
| commit | 67351f672450d5f13754294405243a59ddd86de9 (patch) | |
| tree | 016368ae0c3b6e56c0dc03c185fe5a095d72f22e /src/app | |
| parent | 391756f262c93d4361fb6189a3ba9704283f73aa (diff) | |
| parent | a1504f138d978d73b2c6129957dd0ee344a97efa (diff) | |
| download | tor-67351f672450d5f13754294405243a59ddd86de9.tar.gz tor-67351f672450d5f13754294405243a59ddd86de9.zip | |
Merge remote-tracking branch 'tor-github/pr/380'
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/main/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/app/main/main.c b/src/app/main/main.c index 8a24df2105..ae87add67d 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -45,6 +45,7 @@ #include "feature/dirauth/process_descs.h" #include "feature/dircache/consdiffmgr.h" #include "feature/dircache/dirserv.h" +#include "feature/dirparse/routerparse.h" #include "feature/hibernate/hibernate.h" #include "feature/hs/hs_cache.h" #include "feature/nodelist/authcert.h" @@ -52,7 +53,6 @@ #include "feature/nodelist/networkstatus.h" #include "feature/nodelist/nodelist.h" #include "feature/nodelist/routerlist.h" -#include "feature/nodelist/routerparse.h" #include "feature/relay/dns.h" #include "feature/relay/ext_orport.h" #include "feature/relay/onion_queue.h" @@ -61,7 +61,6 @@ #include "feature/rend/rendcache.h" #include "feature/rend/rendclient.h" #include "feature/rend/rendservice.h" -#include "lib/geoip/geoip.h" #include "feature/stats/geoip_stats.h" #include "feature/stats/predict_ports.h" #include "feature/stats/rephist.h" @@ -70,6 +69,8 @@ #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_s2k.h" #include "lib/err/backtrace.h" +#include "lib/geoip/geoip.h" + #include "lib/process/waitpid.h" #include "lib/meminfo/meminfo.h" @@ -423,7 +424,6 @@ dumpstats(int severity) rep_hist_dump_stats(now,severity); rend_service_dump_stats(severity); - dump_distinct_digest_count(severity); } /** Called by exit() as we shut down the process. |