summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-04-06 09:26:16 -0400
committerNick Mathewson <nickm@torproject.org>2015-04-06 09:26:16 -0400
commit047555214056da24d682d47562a88e53563e49ff (patch)
treefcdf1b7cec6e6916a24ab3a7c47db5cf2faae8b0 /changes
parent929a8f199bc236c39794f675a7bb8ad00b155257 (diff)
parentfe69a7e1d7658d3202af0c2c7308d342faaa1559 (diff)
downloadtor-047555214056da24d682d47562a88e53563e49ff.tar.gz
tor-047555214056da24d682d47562a88e53563e49ff.zip
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
Diffstat (limited to 'changes')
-rw-r--r--changes/bug156005
-rw-r--r--changes/bug156014
2 files changed, 9 insertions, 0 deletions
diff --git a/changes/bug15600 b/changes/bug15600
new file mode 100644
index 0000000000..ee1d6cfe19
--- /dev/null
+++ b/changes/bug15600
@@ -0,0 +1,5 @@
+ o Major bugfixes (security, hidden service):
+ - Fix an issue that would allow a malicious client to trigger
+ an assertion failure and halt a hidden service. Fixes
+ bug 15600; bugfix on 0.2.1.6-alpha. Reported by "skruffy".
+
diff --git a/changes/bug15601 b/changes/bug15601
new file mode 100644
index 0000000000..2cc880af7f
--- /dev/null
+++ b/changes/bug15601
@@ -0,0 +1,4 @@
+ o Major bugfixes (security, hidden service):
+ - Fix a bug that could cause a client to crash with an assertion
+ failure when parsing a malformed hidden service descriptor.
+ Fixes bug 15601; bugfix on 0.2.1.5-alpha. Found by "DonnCha".