[tor-commits] [tor/release-0.3.3] Fold in changelog entry.

[nickm at torproject.org]

commit 035a35178c92da94400c13767a265053ff6c8413
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 12 09:47:25 2018 -0400

    Fold in changelog entry.
---
 ChangeLog           | 4 ++++
 ReleaseNotes        | 4 ++++
 changes/ticket26343 | 3 ---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f93bfc219..6fcf7aab4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@ Changes in version 0.3.3.7 - 2018-06-12
   Tor 0.3.3.7 backports several changes from the 0.3.4.x series, including
   fixes for bugs affecting compatibility and stability.
 
+  o Directory authority changes:
+    - Add an IPv6 address for the "dannenberg" directory authority.
+      Closes ticket 26343.
+
   o Minor features (geoip):
     - Update geoip and geoip6 to the June 7 2018 Maxmind GeoLite2
       Country database. Closes ticket 26351.
diff --git a/ReleaseNotes b/ReleaseNotes
index 1f1586a9b..ad2b7180f 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -6,6 +6,10 @@ Changes in version 0.3.3.7 - 2018-06-12
   Tor 0.3.3.7 backports several changes from the 0.3.4.x series, including
   fixes for bugs affecting compatibility and stability.
 
+  o Directory authority changes:
+    - Add an IPv6 address for the "dannenberg" directory authority.
+      Closes ticket 26343.
+
   o Minor features (geoip):
     - Update geoip and geoip6 to the June 7 2018 Maxmind GeoLite2
       Country database. Closes ticket 26351.
diff --git a/changes/ticket26343 b/changes/ticket26343
deleted file mode 100644
index ab5f332ee..000000000
--- 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.