diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-02-05 14:00:50 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-02-05 14:00:50 -0500 |
commit | b5a8fd1566e137f27c49d132755d2ad9e5c74f4e (patch) | |
tree | c258d96f65ae9f4d42a539a33357b9c496a4c135 | |
parent | f0d7905bc9f20ecee43da3db369073ffb73b4997 (diff) | |
parent | f08fa974600625e4ea0b21d0143d28fe280008d5 (diff) | |
download | tor-b5a8fd1566e137f27c49d132755d2ad9e5c74f4e.tar.gz tor-b5a8fd1566e137f27c49d132755d2ad9e5c74f4e.zip |
Merge remote-tracking branch 'dgoulet/ticket24902_029_05'
-rw-r--r-- | src/or/geoip.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/or/geoip.c b/src/or/geoip.c index 15871f0d2f..0ff1c6ce0d 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -773,13 +773,7 @@ geoip_client_cache_handle_oom(time_t now, size_t min_remove_bytes) size_t geoip_client_cache_total_allocation(void) { - size_t bytes = 0; - clientmap_entry_t **ent; - - HT_FOREACH(ent, clientmap, &client_history) { - bytes += clientmap_entry_size(*ent); - } - return bytes; + return geoip_client_history_cache_size; } /** How many responses are we giving to clients requesting v3 network |