commit 1d9ffb7cb51f9cc11cb4aef1a783fd23921bc320 Author: Matthew Finkel sysrqb@torproject.org Date: Thu Mar 25 15:02:48 2021 +0000

Release preparation for 10.0.15

Versions bump and Changelog update --- projects/firefox/config | 2 +- projects/openssl/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++++ rbm.conf | 6 +++--- 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config index 58ed9f4..22b491c 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-build3' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/openssl/config b/projects/openssl/config index 86f1357..09a8407 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.1.1j +version: 1.1.1k filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'

var: @@ -31,4 +31,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-%5B% c("version") %].tar.gz' - sha256sum: aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf + sha256sum: 892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 617a77a..924c893 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 10.0.15 -- March 26 2021 + * Windows + OS X + Linux + * Update Openssl to 1.1.1k + * Bug 40030: Add 'noscript' capability to NoScript [torbutton] + Tor Browser 10.0.14 -- March 23 2021 * Windows + OS X + Linux * Update Firefox to 78.9.0esr diff --git a/rbm.conf b/rbm.conf index 18d0e9e..6cdedde 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,11 +24,11 @@ buildconf: git_signtag_opt: '-s'

var: - torbrowser_version: '10.0.14' - torbrowser_build: 'build2' + torbrowser_version: '10.0.15' + torbrowser_build: 'build1' torbrowser_incremental_from: - 10.0.12 - - 10.0.13 + - 10.0.14 project_name: tor-browser multi_lingual: 0 build_mar: 1