commit e75d59018ee6cd5a92def62999d719af2cf52418 Author: Matthew Finkel sysrqb@torproject.org Date: Sat May 2 17:25:05 2020 +0000

Release preparations for 9.5a12

Versions bump and Changelog update. --- projects/firefox-langpacks/config | 2 +- projects/firefox-locale-bundle/config | 2 +- projects/firefox/config | 2 +- projects/openssl/config | 4 +-- projects/tba-translation/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 34 ++++++++++++++++++++-- projects/tor-browser/config | 4 +-- projects/tor-launcher/config | 2 +- rbm.conf | 7 ++--- 9 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 2d55896..17a707a 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil

var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build3 + ff_build: build2 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'

targets: diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index b2d33a8..2ea6db6 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build3 + ff_build: build2 diff --git a/projects/firefox/config b/projects/firefox/config index f03c110..b6a8440 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.7.0 + firefox_platform_version: 68.8.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/openssl/config b/projects/openssl/config index 179c2d5..7399c0a 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.1.1f +version: 1.1.1g filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'

var: @@ -31,6 +31,6 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-%5B% c("version") %].tar.gz' - sha256sum: 186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35 + sha256sum: ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46 - filename: use-SOURCE_DATE_EPOCH.patch enable: '[% c("var/windows") %]' diff --git a/projects/tba-translation/config b/projects/tba-translation/config index 3b46b94..911d0ae 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: 922fec4c767aad5efb7411c2430f2b197b921045 +git_hash: 40d0ed51f51c7e42b9753b22292f35be5c30163d version: '[% c("abbrev") %]' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 7f826ee..a9ef63d 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,36 @@ -Tor Browser 9.5a12 -- April XX 2020 +Tor Browser 9.5a12 -- May 6 2020 * All Platforms - Bug 33630: Remove noisebridge01 default bridge + * Update Firefox to 68.8.0esr + * Bump NoScript to 11.0.25 + * Translations update + * Bug 34017: Bump openssl version to 1.1.1g + * Bug 33630: Remove noisebridge01 default bridge + * Bug 31499: Update libevent to 2.1.11-stable + * Bug 33877: Disable Samples and Regression tests For Libevent Build + * Bug 33698: Update "About Tor Browser" links in Tor Browser + * Android + * Translations update + * Bump Tor to 0.4.3.3-alpha + * Bug 33359: Use latest Version of TOPL and Remove Patches + * Bug 33931: obfs4 bridges are used instead of meek if meek is selected in Tor Browser for Android alpha + * Windows + OS X + Linux + * Translations update + * Update Tor Launcher to 0.2.21.6 + * Translations update + * Bug 33573: Update pion-webrtc version to 2.2.3 + * Bug 33726: Fix patch for #23247: Communicating security expectations for .onion + * Bug 32418: Allow updates to be disabled via an enterprise policy. + * Bug 34032: Use Securedrop's Official https-everywhere ruleset + * Build System + * All Platforms + * Bug 32027: Bump Go to 1.13.10 + * Android + * Bug 28765: LibEvent Build for Android + * Bug 28766: Tor Build for Android + * Bug 32993: Package Tor With Tor Android Service Project + * Bug 33685: Add Support for Building zlib for Android + * Windows + * Bug 33802: --enable-secure-api is not supported anymore in mingw-w64

Tor Browser 9.5a11 -- April 8 2020 * All Platforms diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 1e93680..33f0cd9 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... + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite... name: noscript - sha256sum: 3f046da13f487392f34858f8a5e2fc24d7d87ff19e98a3a7907f59baff8a3705 + sha256sum: 2e55cf6dc6d0f6012e2f0328ecfec182a4f02c94e2fc40818af41f610ebd6668 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index e0f0113..2b28a77 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.21.5 +version: 0.2.21.6 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 819a257..bf0d7d2 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,11 +24,10 @@ buildconf: git_signtag_opt: '-s'

var: - torbrowser_version: '9.5a11' - torbrowser_build: 'build2' + torbrowser_version: '9.5a12' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.5a9 - - 9.5a10 + - 9.5a11 project_name: tor-browser multi_lingual: 0 build_mar: 1