summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-12 09:47:07 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-12 09:47:07 -0400
commitbc951e83aac770d123118bf485d14490c2539048 (patch)
tree5fc4697f4deb8f6a6199b0a837927231d8410205
parent03f3ee6d74d548b1f8ed10c475f450977c518b34 (diff)
downloadtor-bc951e83aac770d123118bf485d14490c2539048.tar.gz
tor-bc951e83aac770d123118bf485d14490c2539048.zip
Fold in changelog entry.tor-0.3.4.2-alpha
-rw-r--r--ChangeLog4
-rw-r--r--changes/ticket263433
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b5b2f00ea2..31a334bbf7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@ Changes in version 0.3.4.2-alpha - 2018-06-12
Tor 0.3.4.2-alpha fixes several minor bugs in the previous alpha
release, and forward-ports an authority-only security fix from 0.3.3.6.
+ o Directory authority changes:
+ - Add an IPv6 address for the "dannenberg" directory authority.
+ Closes ticket 26343.
+
o Major bugfixes (security, directory authority, denial-of-service, also in 0.3.3.6):
- Fix a bug that could have allowed an attacker to force a directory
authority to use up all its RAM by passing it a maliciously
diff --git a/changes/ticket26343 b/changes/ticket26343
deleted file mode 100644
index ab5f332ee6..0000000000
--- a/changes/ticket26343
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor features (directory authority):
- - Add an IPv6 address for the "dannenberg" directory
- authority. Closes ticket 26343.