[tor-commits] [tor-browser-build/maint-9.5] Release preparations for 9.5.1

[sysrqb at torproject.org]

commit 4deaf6277e46684021af8e250666f5cf815a773d
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Tue Jun 23 19:19:01 2020 +0000

    Release preparations for 9.5.1
    
    Changelog update and versions bump
---
 projects/firefox/config                             |  4 ++--
 projects/tba-translation/config                     |  2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 12 ++++++++++++
 projects/tor-browser/config                         |  4 ++--
 rbm.conf                                            |  6 +++---
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 012f82a..b5d3d08 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,14 +1,14 @@
 # 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
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 68.9.0
+  firefox_platform_version: 68.10.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 9.5
   branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha'
diff --git a/projects/tba-translation/config b/projects/tba-translation/config
index ab5c04e..520f570 100644
--- a/projects/tba-translation/config
+++ b/projects/tba-translation/config
@@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 git_url: https://git.torproject.org/translation.git
 # We need to bump the commit before releasing but just pointing to a branch
 # might cause too much rebuidling of the Firefox part.
-git_hash: d5bd416ac0cda30893e18f2eb511514bd2e698bd
+git_hash: e93401f698cca39971395625e1f8de54b978ab88
 version: '[% c("abbrev") %]'
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 3439afa..a893105 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,15 @@
+Tor Browser 9.5.1 -- June 30 2020
+ * All Platforms
+   * Update Firefox to 68.10.0esr
+   * Update NoScript to 11.0.31
+ * Windows + OS X + Linux
+   * Bug 34361: "Prioritize .onion sites when known" appears under General
+   * Bug 34362: Improve Onion Service Authentication prompt
+   * Bug 34369: Fix learn more link in Onion Auth prompt
+   * Bug 34379: Fix learn more for Onion-Location
+ * Android
+   * Translations update
+
 Tor Browser 9.5 -- June 2 2020
  * All Platforms
    * Update Firefox to 68.9.0esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 3f41ed2..697f737 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -73,9 +73,9 @@ input_files:
     enable: '[% c("var/snowflake") %]'
   - filename: Bundle-Data
     enable: '[% ! c("var/android") %]'
-  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.0.26-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.0.31-an+fx.xpi
     name: noscript
-    sha256sum: 99a70a78733fe7e21852f67bde090f6a57b5bdbd34ecbbdfcf481dc861965fd8
+    sha256sum: 16691879de18566c01d5ae9fcdfde183ab645ee6580cae2ee5a37770deac375f
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/rbm.conf b/rbm.conf
index 77d8e56..3e8689b 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '9.5'
-  torbrowser_build: 'build2'
+  torbrowser_version: '9.5.1'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 9.0.10
+    - 9.5
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1