diff options
author | Nick Mathewson <nickm@torproject.org> | 2014-10-19 14:35:29 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2014-10-19 14:35:29 -0400 |
commit | 43836f6f0ab7c25b0c8c9fab366ec664ebd0b0ee (patch) | |
tree | d47c734edfd322945a2ab61179aab3b996e5d383 /changes/bug9063_redux | |
parent | e318ab14b10f353da1ebcece0d6490191517e21a (diff) | |
parent | c1c83eb376a7c89fadb01d1c7082d4aa4125333d (diff) | |
download | tor-43836f6f0ab7c25b0c8c9fab366ec664ebd0b0ee.tar.gz tor-43836f6f0ab7c25b0c8c9fab366ec664ebd0b0ee.zip |
Merge remote-tracking branch 'origin/maint-0.2.3' into release-0.2.3release-0.2.3
Diffstat (limited to 'changes/bug9063_redux')
-rw-r--r-- | changes/bug9063_redux | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/changes/bug9063_redux b/changes/bug9063_redux new file mode 100644 index 0000000000..e6fae72efc --- /dev/null +++ b/changes/bug9063_redux @@ -0,0 +1,15 @@ + o Major bugfixes: + - When we have too much memory queued in circuits (according to a new + MaxMemInCellQueues option), close the circuits consuming the most + memory. This prevents us from running out of memory as a relay if + circuits fill up faster than they can be drained. Fixes + bug 9063; bugfix on the 54th commit of Tor. This bug is a further + fix beyond bug 6252, whose fix was merged into 0.2.3.21-rc. + + Also fixes an earlier approach taken in 0.2.4.13-alpha, where we + tried to solve this issue simply by imposing an upper limit on the + number of queued cells for a single circuit. That approach proved to + be problematic, since there are ways to provoke clients to send a + number of cells in excess of any such reasonable limit. + Fixes bug 9072; bugfix on 0.2.4.13-alpha. + |