diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-04-25 08:12:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-04-25 08:12:59 -0400 |
| commit | ba405f86bf33ed0e6c9552b3d9aad87bb79c1237 (patch) | |
| tree | 4f50dd06a62263594e69c701253d4a632d1c7574 /src/or/relay.c | |
| parent | db95a6e17129b51e0409dbcad1707367f9388173 (diff) | |
| parent | 2210b330e757d234346191e5d05af761fe8561e6 (diff) | |
| download | tor-ba405f86bf33ed0e6c9552b3d9aad87bb79c1237.tar.gz tor-ba405f86bf33ed0e6c9552b3d9aad87bb79c1237.zip | |
Merge branch 'ahf_prop278_21662_squashed'
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 5139036327..8524080939 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -54,6 +54,7 @@ #include "circuitbuild.h" #include "circuitlist.h" #include "circuituse.h" +#include "compress.h" #include "config.h" #include "connection.h" #include "connection_edge.h" @@ -2453,7 +2454,7 @@ cell_queues_check_size(void) { size_t alloc = cell_queues_get_total_allocation(); alloc += buf_get_total_allocation(); - alloc += tor_zlib_get_total_allocation(); + alloc += tor_compress_get_total_allocation(); const size_t rend_cache_total = rend_cache_get_total_allocation(); alloc += rend_cache_total; if (alloc >= get_options()->MaxMemInQueues_low_threshold) { |