summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-06-08 09:21:15 -0400
committerNick Mathewson <nickm@torproject.org>2017-06-08 09:21:15 -0400
commit83135d75a3d87e4fd5f163aecb742180c01d9d0e (patch)
tree486864df83ad112b20690ab8fe14861fc67f9c83 /changes
parent9acca040257caf5894126e8da3df7226f6dcd480 (diff)
parent53011e3e54c3d8374c7044b657f90eb723ac39d1 (diff)
downloadtor-83135d75a3d87e4fd5f163aecb742180c01d9d0e.tar.gz
tor-83135d75a3d87e4fd5f163aecb742180c01d9d0e.zip
Merge branch 'maint-0.3.0'
Diffstat (limited to 'changes')
-rw-r--r--changes/trove-2017-0044
-rw-r--r--changes/trove-2017-0057
2 files changed, 9 insertions, 2 deletions
diff --git a/changes/trove-2017-004 b/changes/trove-2017-004
index aa901456b0..eb0789de01 100644
--- a/changes/trove-2017-004
+++ b/changes/trove-2017-004
@@ -1,8 +1,8 @@
o Major bugfixes (hidden service, relay, security):
- - Fix an assertion failure when an hidden service handles a
+ - Fix an assertion failure when a hidden service handles a
malformed BEGIN cell. This bug resulted in the service crashing
triggered by a tor_assert(). Fixes bug 22493, tracked as
- TROVE-2017-004 and as CVE-2017-0375; bugfix on tor-0.3.0.1-alpha.
+ TROVE-2017-004 and as CVE-2017-0375; bugfix on 0.3.0.1-alpha.
Found by armadev.
diff --git a/changes/trove-2017-005 b/changes/trove-2017-005
new file mode 100644
index 0000000000..cebb013f86
--- /dev/null
+++ b/changes/trove-2017-005
@@ -0,0 +1,7 @@
+ o Major bugfixes (hidden service, relay, security):
+ - Fix an assertion failure caused by receiving a BEGIN_DIR cell on
+ a hidden service rendezvous circuit. Fixes bug 22494, tracked as
+ TROVE-2017-005 and CVE-2017-0376; bugfix on 0.2.2.1-alpha. Found
+ by armadev.
+
+