tor

commit b5a8fd1566e137f27c49d132755d2ad9e5c74f4e
parent f0d7905bc9f20ecee43da3db369073ffb73b4997
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon,  5 Feb 2018 14:00:50 -0500

Merge remote-tracking branch 'dgoulet/ticket24902_029_05'

Diffstat:
M
src/or/geoip.c
 | 
8
+-------

1 file changed, 1 insertion(+), 7 deletions(-)
diff --git 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