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

[sysrqb@xxxxxxxxxxxxxx]

commit 8aa469dc35d9003ca38006f15c809581f698abfa
Author: Matthew Finkel <sysrqb@xxxxxxxxxxxxxx>
Date:   Tue Jul 21 16:39:51 2020 +0000

    Release preparations for 9.5.3
    
    Changelog update and versions bump
---
 projects/firefox/config                             | 2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 6 ++++++
 projects/tor-browser/config                         | 4 ++--
 projects/tor/build                                  | 3 ---
 projects/tor/config                                 | 3 +--
 rbm.conf                                            | 4 ++--
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 414097f..022eea9 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -8,7 +8,7 @@ git_submodule: 1
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 68.10.1
+  firefox_platform_version: 68.11.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/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index bd49a23..0e14dae 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,9 @@
+Tor Browser 9.5.3 -- July 28 2020
+ * All Platforms
+   * Update Firefox to 68.11.0esr
+   * Update NoScript to 11.0.34
+   * Update Tor to 0.4.3.6
+
 Tor Browser 9.5.2 -- July 7 2020
  * Android
    * Update Firefox to 68.10.1esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 6bd09de..9254cf6 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.32-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.0.34-an+fx.xpi
     name: noscript
-    sha256sum: 088c0b0f08529d88aacee3b1c09cfafe304b98cb2847c3fc255e05d1bf10bd6d
+    sha256sum: 759a38df3ef121804bf8933ab5289ec8452d5663fcad2f484b73095d8b488578
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/projects/tor/build b/projects/tor/build
index 012ec98..6dd22f7 100644
--- a/projects/tor/build
+++ b/projects/tor/build
@@ -92,9 +92,6 @@ openssldir=/var/tmp/dist/openssl/openssl
 
 cd /var/tmp/build/[% project %]-[% c('version') %]
 
-# Cherry-pick patch until 0.4.3.6 is released.
-patch -p1 < $rootdir/0001-hs-v3-Improve-accessor-semantic-of-client-cached-obj.patch
-
 # add git hash to micro-revision.i for #24995
 echo '"[% c("abbrev", { abbrev_length => 16 }) %]"' > micro-revision.i
 ./autogen.sh
diff --git a/projects/tor/config b/projects/tor/config
index 1f57465..999f387 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -1,6 +1,6 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-version: 0.4.3.5
+version: 0.4.3.6
 git_hash: 'tor-[% c("version") %]'
 git_url: https://git.torproject.org/tor.git
 git_submodule: 1
@@ -68,4 +68,3 @@ input_files:
   - name: zstd
     project: zstd
     enable: '[% c("var/android") %]'
-  - filename: 0001-hs-v3-Improve-accessor-semantic-of-client-cached-obj.patch
diff --git a/rbm.conf b/rbm.conf
index 05ffcf2..111ea70 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '9.5.2'
+  torbrowser_version: '9.5.3'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 9.5
+    - 9.5.1
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits