commit bb1731c85654945e78e5e847aa12d7ad10d069d6 Author: Matthew Finkel sysrqb@torproject.org Date: Sat Jan 4 19:39:05 2020 +0000

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

diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 0fe2aa1..a6943b3 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -2,14 +2,15 @@ Tor Browser 9.0.3 -- January 7 2019 * All Platforms * Update Firefox to 68.4.0esr * Bump NoScript to 11.0.11 + * Bump Tor to 0.4.2.5 * Translations update * Update OpenPGP keyring - * Bug 27268: Preferences clean-up in Torbutton code * Bug 32606: Set up default bridge at Georgetown University * Bug 32659: Remove IPv6 address of default bridge * Bug 32547: Add new default bridge at UMN * Bug 31855: Remove End of Year Fundraising Campaign from about:tor - * Bug 32674: Point the about:tor "Get involved" link to the community portal + * Windows + OS X + Linux + * Update Tor Launcher to 0.2.20.5 * Android * Bug 32405: Crash immediately after bootstrap on Android * Build System diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index dd881c1..e2321d2 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.20.4 +version: 0.2.20.5 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index 74790af..4a1045c 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.1.6 +version: 0.4.2.5 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 6fc8ed6..6139b9f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf:

var: torbrowser_version: '9.0.3' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.0.2 project_name: tor-browser