tor

commit bc951e83aac770d123118bf485d14490c2539048
parent 03f3ee6d74d548b1f8ed10c475f450977c518b34
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 12 Jun 2018 09:47:07 -0400

Fold in changelog entry.

Diffstat:
M
ChangeLog
 | 
4
++++
D
changes/ticket26343
 | 
3
---

2 files changed, 4 insertions(+), 3 deletions(-)
diff --git 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
@@ -1,3 +0,0 @@
-  o Minor features (directory authority):
-    - Add an IPv6 address for the "dannenberg" directory
-      authority. Closes ticket 26343.