summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-12 09:47:25 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-12 09:47:25 -0400
commit035a35178c92da94400c13767a265053ff6c8413 (patch)
treeca6d8927c068a2f8fecd996a6b6c4e68d2239347
parentce959b9424aef1fa04b0d4c21faa59f92e42b43d (diff)
downloadtor-035a35178c92da94400c13767a265053ff6c8413.tar.gz
tor-035a35178c92da94400c13767a265053ff6c8413.zip
Fold in changelog entry.tor-0.3.3.7
-rw-r--r--ChangeLog4
-rw-r--r--ReleaseNotes4
-rw-r--r--changes/ticket263433
3 files changed, 8 insertions, 3 deletions
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.