[tor-commits] [tor/release-0.3.3] fold changes into 0.3.3.9

[arma at torproject.org]

commit 5521729da9fc5ca732db4f9ccd2e217f4231e1b6
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Jul 12 20:24:54 2018 -0400

    fold changes into 0.3.3.9
---
 ChangeLog         | 10 ++++++++++
 ReleaseNotes      | 10 ++++++++++
 changes/task26771 |  4 ----
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c20e69f7d..6841848c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Changes in version 0.3.3.9 - 2018-07-13
+  Tor 0.3.3.9 moves to a new bridge authority, meaning people running
+  bridge relays should upgrade.
+
+  o Directory authority changes:
+    - The "Bifroest" bridge authority has been retired; the new bridge
+      authority is "Serge", and it is operated by George from the
+      TorBSD project. Closes ticket 26771.
+
+
 Changes in version 0.3.3.8 - 2018-07-09
   Tor 0.3.3.8 backports several changes from the 0.3.4.x series, including
   fixes for a memory leak affecting directory authorities.
diff --git a/ReleaseNotes b/ReleaseNotes
index b021cf8a2..f2befc12f 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,16 @@ This document summarizes new features and bugfixes in each stable
 release of Tor. If you want to see more detailed descriptions of the
 changes in each development snapshot, see the ChangeLog file.
 
+Changes in version 0.3.3.9 - 2018-07-13
+  Tor 0.3.3.9 moves to a new bridge authority, meaning people running
+  bridge relays should upgrade.
+
+  o Directory authority changes:
+    - The "Bifroest" bridge authority has been retired; the new bridge
+      authority is "Serge", and it is operated by George from the
+      TorBSD project. Closes ticket 26771.
+
+
 Changes in version 0.3.3.8 - 2018-07-09
   Tor 0.3.3.8 backports several changes from the 0.3.4.x series, including
   fixes for a memory leak affecting directory authorities.
diff --git a/changes/task26771 b/changes/task26771
deleted file mode 100644
index fd700900f..000000000
--- a/changes/task26771
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Directory authority changes:
-    - The "Bifroest" bridge authority has been retired; the new bridge
-      authority is "Serge", and it is operated by George from the
-      TorBSD project. Closes ticket 26771.