aboutsummaryrefslogtreecommitdiff
path: root/src/or/relay.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-08-24 13:09:08 -0400
committerNick Mathewson <nickm@torproject.org>2014-08-24 13:09:08 -0400
commit59e114832e7f67cb2fac1258c7423b6359160505 (patch)
treec514cdb610f7d845c4efc29a807774b90059f69f /src/or/relay.c
parentd31bcc4b235c98ffb1b9a2c4fead7fb61d71fe75 (diff)
parentd6033843a49ff029d9f8d070b3c1f446a6edc9fa (diff)
downloadtor-59e114832e7f67cb2fac1258c7423b6359160505.tar.gz
tor-59e114832e7f67cb2fac1258c7423b6359160505.zip
Merge branch 'bug11792_1_squashed'
Conflicts: src/or/circuitlist.c
Diffstat (limited to 'src/or/relay.c')
-rw-r--r--src/or/relay.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/relay.c b/src/or/relay.c
index bb60469066..d97c84fb07 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -2439,6 +2439,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();
if (alloc >= get_options()->MaxMemInQueues) {
circuits_handle_oom(alloc);
return 1;