summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-06-08 09:29:49 -0400
committerNick Mathewson <nickm@torproject.org>2017-06-08 09:29:49 -0400
commit03b91ac8c9b082430ba466ef72ef0c6ca594e698 (patch)
tree903107c44dd95340164c707e0b584be811c3e957 /changes
parent63d0426af5b87f4dd0de710702728c4d737514de (diff)
parentd389480da54dfff4900b5ddf8c0795a02672bafe (diff)
downloadtor-03b91ac8c9b082430ba466ef72ef0c6ca594e698.tar.gz
tor-03b91ac8c9b082430ba466ef72ef0c6ca594e698.zip
Merge branch 'maint-0.3.0' into release-0.3.0
Diffstat (limited to 'changes')
-rw-r--r--changes/trove-2017-0042
1 files changed, 0 insertions, 2 deletions
diff --git a/changes/trove-2017-004 b/changes/trove-2017-004
index eb0789de01..af1567f220 100644
--- a/changes/trove-2017-004
+++ b/changes/trove-2017-004
@@ -4,5 +4,3 @@
triggered by a tor_assert(). Fixes bug 22493, tracked as
TROVE-2017-004 and as CVE-2017-0375; bugfix on 0.3.0.1-alpha.
Found by armadev.
-
-