[tor-commits] [tor-browser-build/master] fixup! Fold in stable 10.0.4 changelog

[gk at torproject.org]

commit d2178e60a2ed866e4dafac43c403af750823b11b
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Sat Nov 14 20:33:11 2020 +0000

    fixup! Fold in stable 10.0.4 changelog
---
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 821086b..5ba0abd 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -42,28 +42,23 @@ Tor Browser 10.5a3 -- November 10 2020
      * Bug 40133: Bump Rust version for ESR 78 to 1.43.0 [tor-browser-build]
 
 Tor Browser 10.0.4 -- November 9 2020
- * Android
+ * All Platforms
    * Update NoScript to 11.1.5
    * Bug 40022: EOY November Update - Matching [torbutton]
-   * Bug 40106: EOY November Update - Matching [fenix]
    * Bug 40219: Backport Mozilla Bug 1675905 [tor-browser]
    * Translations update
- * Build System
-   * Android
-     * Update Go to 1.14.11
-     * Bug 40141: Include "android" in signed tag [tor-browser-build]
-
-Tor Browser 10.0.4 -- November 9 2020
  * Windows + OS X + Linux
-   * Update NoScript to 11.1.5
    * Bug 40021: Keep page shown after Tor Browser update purple [torbutton]
-   * Bug 40022: EOY November Update - Matching [torbutton]
-   * Bug 40219: Backport Mozilla Bug 1675905 [tor-browser]
+ * Android
+   * Bug 40106: EOY November Update - Matching [fenix]
    * Translations update
  * Build System
-   * Windows + OS X + Linux
+   * All Platforms
      * Update Go to 1.14.11
+   * Windows + OS X + Linux
      * Bug 40141: Include "desktop" in signed tag [tor-browser-build]
+   * Android
+     * Bug 40141: Include "android" in signed tag [tor-browser-build]
 
 Tor Browser 10.0.3 -- November 2 2020
  * Android