summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-06-19 12:20:38 -0400
committerNick Mathewson <nickm@torproject.org>2016-06-19 12:20:38 -0400
commit81cfd5c9a1af1641d980d5b985810fdd85681fa7 (patch)
tree909eca6db5b69d30217d908354ec041c2094e1cc /changes
parentb421648da2d3e73e0cfd6fd847c3279f64a332cd (diff)
parentd937b866999b18e65df3815d0310d9469b15b914 (diff)
downloadtor-81cfd5c9a1af1641d980d5b985810fdd85681fa7.tar.gz
tor-81cfd5c9a1af1641d980d5b985810fdd85681fa7.zip
Merge branch 'zlib_coverage_squashed'
Diffstat (limited to 'changes')
-rw-r--r--changes/test_zlib_bombs3
-rw-r--r--changes/zlib_124
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/test_zlib_bombs b/changes/test_zlib_bombs
new file mode 100644
index 0000000000..26121ed8ce
--- /dev/null
+++ b/changes/test_zlib_bombs
@@ -0,0 +1,3 @@
+ o Testing:
+ - We now have unit tests for our code to reject zlib "compression bombs".
+ (Fortunately, the code works fine.)
diff --git a/changes/zlib_12 b/changes/zlib_12
new file mode 100644
index 0000000000..3344286861
--- /dev/null
+++ b/changes/zlib_12
@@ -0,0 +1,4 @@
+ o New system requirements:
+ - We now require zlib version 1.2 or later. (Back when we started,
+ zlib 1.1 and zlib 1.0 were still found in the wild. 1.2 was released in
+ 2003. We recommend the latest version.)