Merge remote-tracking branch 'dgoulet/ticket24902_029_05'

This commit is contained in:
Nick Mathewson 2018-02-05 14:00:50 -05:00
commit b5a8fd1566

View File

@ -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