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
commit40bccc20042fcc4f43964b358257470830169e73 (patch)
tree59a3a63518f1c8aae96cd26de2657084a4b26975 /changes
parenta56cfdaba20683562e5793d6bded58a591afb04c (diff)
parentdec7998f5c42dde955760efc72f57025a32da238 (diff)
downloadtor-40bccc20042fcc4f43964b358257470830169e73.tar.gz
tor-40bccc20042fcc4f43964b358257470830169e73.zip
Merge branch 'maint-0.2.5' into maint-0.2.6
Diffstat (limited to 'changes')
-rw-r--r--changes/trove-2017-0057
1 files changed, 7 insertions, 0 deletions
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.
+
+