aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-06-29 11:38:06 -0400
committerNick Mathewson <nickm@torproject.org>2017-06-29 11:38:06 -0400
commit3781678a3c38fbbf95abea9c055d08ca20b870f6 (patch)
tree56b34dc2923f1220a2d412dc721b2cbbd00f4c0b /changes
parent2c718c1a12f06bdaa9c735a8d201c20b7ca4cfac (diff)
parent31a08ba26fc5eaa12de6d3c5efa3aac4d00509d0 (diff)
downloadtor-3781678a3c38fbbf95abea9c055d08ca20b870f6.tar.gz
tor-3781678a3c38fbbf95abea9c055d08ca20b870f6.zip
Merge branch 'maint-0.3.1'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug226704
-rw-r--r--changes/bug22670_024
-rw-r--r--changes/bug22670_036
3 files changed, 14 insertions, 0 deletions
diff --git a/changes/bug22670 b/changes/bug22670
new file mode 100644
index 0000000000..47403277d2
--- /dev/null
+++ b/changes/bug22670
@@ -0,0 +1,4 @@
+ o Minor bugfixes (logging, compression):
+ - When decompressing, do not warn if we fail to decompress using a
+ compression method that we merely guessed. Fixes part of
+ bug 22670; bugfix on 0.1.1.14-alpha.
diff --git a/changes/bug22670_02 b/changes/bug22670_02
new file mode 100644
index 0000000000..3e7a428faf
--- /dev/null
+++ b/changes/bug22670_02
@@ -0,0 +1,4 @@
+ o Minor bugfixes (logging, compression):
+ - When decompressing, treat mismatch between content-encoding and
+ actual compression type as a protocol warning. Fixes part of bug
+ 22670; bugfix on 0.1.1.9-alpha.
diff --git a/changes/bug22670_03 b/changes/bug22670_03
new file mode 100644
index 0000000000..8a7aa49bcd
--- /dev/null
+++ b/changes/bug22670_03
@@ -0,0 +1,6 @@
+ o Minor bugfixes (compression):
+ - When decompressing an object received over an anonymous directory
+ connection, if we have already successfully decompressed it using an
+ acceptable compression method, do not reject it for looking like an
+ unacceptable compression method. Fixes part of bug 22670; bugfix on
+ 0.3.1.1-alpha.