summaryrefslogtreecommitdiff
path: root/changes/bug11792
diff options
context:
space:
mode:
Diffstat (limited to 'changes/bug11792')
-rw-r--r--changes/bug117928
1 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug11792 b/changes/bug11792
index 1d381891db..7395b4aba5 100644
--- a/changes/bug11792
+++ b/changes/bug11792
@@ -2,4 +2,10 @@
- When closing an edge connection because we've run out of memory,
also count the amount of memory that any tunnelled directory
connection attached to that connection had consumed. Part of
- ticket 11792. \ No newline at end of file
+ ticket 11792.
+
+ - When considering whether we're running low on memory, consider
+ memory that was allocated as part of zlib buffers as well.
+ Count that memory as reclaimed by our OOM handler. Part of
+ ticket 11792.
+