commit cdd071662ca62645e30a29b15315c4b82b14372a Author: Matthew Finkel sysrqb@torproject.org Date: Fri Oct 16 13:19:52 2020 +0000

Pick up tor-browser -build2 --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 ++ rbm.conf | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config index 9d08d8c..2633653 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-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index ac85f33..8e7181b 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -4,6 +4,8 @@ Tor Browser 10.0.2 -- October 20 2020 * Update NoScript to 11.1.3 * Bug 40192: Backport Mozilla Bug 1658881 * Translations update + * Linux + * Bug 40193: Add `AT_EMPTY_PATH` definition

Tor Browser 10.0.1 -- October 13 2020 * Windows + OS X + Linux diff --git a/rbm.conf b/rbm.conf index 218f8ef..e097cd7 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf:

var: torbrowser_version: '10.0.2' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 10.0 - 10.0.1