commit 7ccd34212b0d18078a90a665ce47a6f5df58964a Author: Matthew Finkel sysrqb@torproject.org Date: Sun Nov 8 15:15:26 2020 +0000

Tor Browser 10.0.4 release preparations

Version bumps and Changelog update --- projects/firefox/config | 2 +- projects/go/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 12 ++++++++++++ projects/tor-browser/config | 4 ++-- rbm.conf | 7 +++---- 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config index 2633653..af0d742 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") %]-2-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build3' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/go/config b/projects/go/config index 5a18dd8..124be1f 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.14.10 +version: 1.14.11 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'

var: @@ -118,7 +118,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go%5B% c("version") %].src.tar.gz' name: go - sha256sum: b37699a7e3eab0f90412b3969a90fd072023ecf61e0b86369da532810a95d665 + sha256sum: 1871f3d29b0cf1ebb739c9b134c9bc559282bd3625856e5f12f5aea29ab70f16 - URL: 'https://golang.org/dl/go%5B% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 99e54bb..526db49 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 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] + * Translations update + * Build System + * Windows + OS X + Linux + * Update Go to 1.14.11 + * Bug 40141: Include "desktop" in signed tag [tor-browser-build] + Tor Browser 10.0.2 -- October 20 2020 * Windows + OS X + Linux * Update Firefox to 78.4.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 8b201f8..3d8e92d 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -77,9 +77,9 @@ input_files: enable: '[% c("var/snowflake") && ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite... + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite... name: noscript - sha256sum: 08543e4a03e0becacd10c3cdbf5eaab1ff35a1648babe6f1522ae335e21de7d4 + sha256sum: 04ca69c90502f3b66cd18a4f832cb915b789b147ffd946b48f1dfb1215eb5398 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/rbm.conf b/rbm.conf index e097cd7..ad6d5f7 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,11 +24,10 @@ buildconf: git_signtag_opt: '-s'

var: - torbrowser_version: '10.0.2' - torbrowser_build: 'build2' + torbrowser_version: '10.0.4' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 10.0 - - 10.0.1 + - 10.0.2 project_name: tor-browser multi_lingual: 0 build_mar: 1