aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-06-08 09:33:23 -0400
committerNick Mathewson <nickm@torproject.org>2017-06-08 09:33:23 -0400
commitac9ac3a35ff69457a06a4aa6b27e034b20b66a6f (patch)
treed98039e50746944af1e79078f9c2dfc2657b7730
parent6a6173a21443884df37cfd4f6046dbe7ef2f2519 (diff)
downloadtor-ac9ac3a35ff69457a06a4aa6b27e034b20b66a6f.tar.gz
tor-ac9ac3a35ff69457a06a4aa6b27e034b20b66a6f.zip
Fold TROVE-2017-005 into changelog
-rw-r--r--ChangeLog7
-rw-r--r--changes/trove-2017-0057
2 files changed, 7 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d75b31d2a..cdc59d7087 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,13 @@ Changes in version 0.2.9.11 - 2017-06-08
that sometimes made relays unreliable, as well as several other
bugfixes described below.
+ o Major bugfixes (hidden service, relay, security, backport
+ from 0.3.1.3-alpha):
+ - Fix a remotely triggerable 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.
+
o Major bugfixes (relay, link handshake, backport from 0.3.1.3-alpha):
- When performing the v3 link handshake on a TLS connection, report
that we have the x509 certificate that we actually used on that
diff --git a/changes/trove-2017-005 b/changes/trove-2017-005
deleted file mode 100644
index cebb013f86..0000000000
--- a/changes/trove-2017-005
+++ /dev/null
@@ -1,7 +0,0 @@
- 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.
-
-