[tbb-commits] [tor-browser-build/master] Fix up ChangeLog and set tor-browser build

[sysrqb at torproject.org]

commit da553a6a2183c881841e0c2f1fd752c10156d0b6
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Sat Nov 30 21:17:51 2019 +0000

    Fix up ChangeLog and set tor-browser build
---
 projects/firefox/config                             |  2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 34f7202..c6f840b 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 git_submodule: 1
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 3edd1c8..a08e22e 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -11,14 +11,22 @@ Tor Browser 9.5a3 -- December 3 2019
    * Bug 30788: Add ms locale
    * Bug 30787: Add th locale
    * Translations update
+   * Bug 28746: Remove torbutton isolation and fp prefs sync
+   * Bug 28745: Assume always running in Tor Browser
+   * Bug 30888: move torbutton_util.js to modules/utils.js
+   * Bug 30851: Move default preferences to 000-tor-browser.js
+   * Bug 28745: Remove torbutton.js unused code
+   * Bug 32255: Missing ORIGIN header breaks CORS
  * Windows + OS X + Linux
    * Update Tor to 0.4.2.4-rc
    * Update Tor Launcher to 0.2.20.3
      * Bug 30787: Add lt locale
-	 * Bug 30788: Add ms locale
-	 * Bug 30787: Add th locale
+     * Bug 30788: Add ms locale
+     * Bug 30787: Add th locale
+   * Bug 30237: Improve TBB UI of hidden service client authorization
  * Android
    * Bug 32365: Localization is broken in Tor Browser 9 on Android
+   * Bug 32405: Crash immediately after bootstrap on Android
  * OS X
    * Bug 32505: Tighten our rules in our entitlements file for macOS
  * Windows