diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-06-20 20:29:00 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-06-20 20:29:00 -0400 |
commit | 884c0ffe3b4266e66adbd6bb914c3b3b00401acb (patch) | |
tree | 34c0547acccc716705b7e09b7f1b4cbd95e6d379 /changes | |
parent | 3830599a63e09008f7b17c1b37db277bf38d526f (diff) | |
parent | e51e7bd38b758d3f71a2e31184dde3771f897af8 (diff) | |
download | tor-884c0ffe3b4266e66adbd6bb914c3b3b00401acb.tar.gz tor-884c0ffe3b4266e66adbd6bb914c3b3b00401acb.zip |
Merge branch 'maint-0.3.1'
Diffstat (limited to 'changes')
-rw-r--r-- | changes/bug22669 | 4 | ||||
-rw-r--r-- | changes/bug22672 | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/changes/bug22669 b/changes/bug22669 new file mode 100644 index 0000000000..804a39e781 --- /dev/null +++ b/changes/bug22669 @@ -0,0 +1,4 @@ + o Minor bugfixes (compression): + - When serving directory votes compressed with zlib, + do not claim to have compressed them with zstd. Fixes bug 22669; + bugfix on 0.3.1.1-alpha. diff --git a/changes/bug22672 b/changes/bug22672 new file mode 100644 index 0000000000..ec6681149d --- /dev/null +++ b/changes/bug22672 @@ -0,0 +1,5 @@ + o Minor features (compression, defensive programming): + - Detect and break out of infinite loops in our compression code. + We don't think that any such loops exist now, but it's best to be + safe. Closes ticket 22672. + |