From 035a35178c92da94400c13767a265053ff6c8413 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 12 Jun 2018 09:47:25 -0400 Subject: Fold in changelog entry. --- ChangeLog | 4 ++++ ReleaseNotes | 4 ++++ changes/ticket26343 | 3 --- 3 files changed, 8 insertions(+), 3 deletions(-) delete mode 100644 changes/ticket26343 diff --git a/ChangeLog b/ChangeLog index f93bfc219e..6fcf7aab42 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 1f1586a9bd..ad2b7180f8 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 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. -- cgit v1.2.3-54-g00ecf