October 2018 - tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 26697: Add Android toolchain
by gk＠torproject.org 25 Oct '18

25 Oct '18

commit 10c58d9a2f9fc37f7ba3e1b7028d2b5a730b1e6f Author: sisbell <shane.isbell(a)gmail.com> Date: Thu Sep 27 20:44:56 2018 -0700 Bug 26697: Add Android toolchain --- projects/android-toolchain/build | 43 +++++++++++++++++++++++++++++++++++++++ projects/android-toolchain/config | 36 ++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build new file mode 100644 index 0000000..325a543 --- /dev/null +++ b/projects/android-toolchain/build @@ -0,0 +1,43 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +export PROJECT_PATH=/var/tmp/dist/[% project %] +export SDK_HOME=$PROJECT_PATH/android-sdk-linux +export NDK_HOME=$PROJECT_PATH/android-ndk +export GRADLE_HOME=$PROJECT_PATH/gradle + +#Make directories +mkdir -p $NDK_HOME $SDK_HOME $GRADLE_HOME + +# Compiler Archives +unzip -qq [% c("input_files_by_name/android_sdk_tools") %] -d $SDK_HOME +unzip -qq [% c("input_files_by_name/android_ndk_compiler")%] -d $NDK_HOME +unzip -qq [% c("input_files_by_name/gradle_bin") %] -d $GRADLE_HOME + +# NDK Archive +cd $NDK_HOME +mv android-ndk-r15c/* . +rm -fR android-ndk-r15c +./build/tools/make_standalone_toolchain.py --api 26 --arch arm --install-dir=./arm + +# Tool Archives +cd $SDK_HOME +unzip -qq $HOME/[% c("input_files_by_name/build_tools_26") %] -d $SDK_HOME +mkdir -p build-tools/26.0.2 +mv android-8.1.0/* build-tools/26.0.2 + +unzip -qq $HOME/[% c("input_files_by_name/platform_26") %] -d $SDK_HOME +mkdir -p platforms/android-26 +mv android-8.0.0/* platforms/android-26 + +unzip -qq $HOME/[% c("input_files_by_name/platform_tools_26") %] -d $SDK_HOME + +# Cleanup +rm -fR android-8.1.0 +rm -fR android-8.0.0 + +# Archive dist directory +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config new file mode 100644 index 0000000..122ae5f --- /dev/null +++ b/projects/android-toolchain/config @@ -0,0 +1,36 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +version: 26.0.2 +var: + container: + use_container: 1 + deps: + - unzip + - python + setup: | + mkdir -p /var/tmp/dist + tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] + export ANDROID_SDK_HOME=/var/tmp/dist/[% project %]/android-sdk-linux + export ANDROID_NDK_HOME=/var/tmp/dist/[% project %]/android-ndk + export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle + google_repo: https://dl.google.com/android/repository +input_files: + - project: container-image + - URL: '[% c("var/google_repo") %]/build-tools_r26.0.2-linux.zip' + name: build_tools_26 + sha256sum: a752849fac85c4a7f9ea165ec8f367b0ebe8bbf6a1f33fc8605342be004231ce + - URL: '[% c("var/google_repo") %]/platform-26_r02.zip' + name: platform_26 + sha256sum: 2aafa7d19c5e9c4b643ee6ade3d85ef89dc2f79e8383efdb9baf7fddad74b52a + - URL: '[% c("var/google_repo") %]/platform-tools_r26.0.2-linux.zip' + name: platform_tools_26 + sha256sum: 63b15a38c2b64e6ec8b54febe9f69fce5fe6c898c554c73b826b49daf7b52519 + - URL: '[% c("var/google_repo") %]/sdk-tools-linux-4333796.zip' + name: android_sdk_tools + sha256sum: 92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9 + - URL: '[% c("var/google_repo") %]/android-ndk-r15c-linux-x86_64.zip' + name: android_ndk_compiler + sha256sum: f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c + - URL: http://services.gradle.org/distributions/gradle-4.1-bin.zip + name: gradle_bin + sha256sum: d55dfa9cfb5a3da86a1c9e75bb0b9507f9a8c8c100793ccec7beb6e259f9ed43

1 0

[tor-launcher/master] Revert "Bug 28082: Add locales cs, el, hu, ka"
by gk＠torproject.org 24 Oct '18

24 Oct '18

commit 670882ad2936a906f3e2d84230714446e98a214c Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 24 08:50:09 2018 +0000 Revert "Bug 28082: Add locales cs, el, hu, ka" This reverts commit 3aa20983122b4aaed6ae77cfc5bdb48107aa33a4. --- src/chrome/content/network-settings.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 1599c28..aaa91ac 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -306,21 +306,17 @@ function populateLocaleList(aLangPackAddons) "ar" : "\u0627\u0644\u0639\u0631\u0628\u064a\u0629", "bn-BD" : "\u09ac\u09be\u0982\u09b2\u09be", "ca" : "català", - "cs" : "\u010De\u0161tina", "da" : "Dansk", "de" : "Deutsch", - "el" : "\u03B5\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC", "es-ES" : "Espa\u00f1ol", "fa" : "\u0641\u0627\u0631\u0633\u06cc", "fr" : "Fran\u00e7ais", "ga" : "Gaeilge (Irish)", "he" : "\u05e2\u05d1\u05e8\u05d9\u05ea", - "hu" : "Magyar nyelv", "id" : "bahasa Indonesia", "is" : "\u0355slenska", "it" : "Italiano", "ja" : "\u65e5\u672c\u8a9e", - "ka" : "\u10E5\u10D0\u10E0\u10D7\u10E3\u10DA\u10D8", "ko" : "\ud55c\uad6d\uc5b4", "nl" : "Nederlands", "nb" : "Norsk bokmå\u0345l",

1 0

[torbutton/master] Revert "Bug 28082: Add locales cs, el, hu, ka"
by gk＠torproject.org 24 Oct '18

24 Oct '18

commit 8f1ff9017e9f793156d1edce38dde8cfcf590b2b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 24 08:49:40 2018 +0000 Revert "Bug 28082: Add locales cs, el, hu, ka" This reverts commit c94a5589ffeabf71ea95c3c5c1a3396bdbe14da5. --- trans_tools/import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 8f562208..d13f8259 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,7 +2,7 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="ar ca cs da de el es fa fr ga he hu id is it ja ka ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" +BUNDLE_LOCALES="ar ca da de es fa fr ga he id is it ja ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" # XXX: Basque (eu) by request in #10687. # This is not used for official builds, but should remain

1 0

[tor-browser-build/master] Revert "Bug 28082: Add locales cs, el, hu, ka"
by gk＠torproject.org 24 Oct '18

24 Oct '18

commit 6803d9a8a4e7c851629cab47342a6579a60f64cd Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 24 08:48:35 2018 +0000 Revert "Bug 28082: Add locales cs, el, hu, ka" This reverts commit fbb72c65a24ac70619062ebcd16c67a9afb4feae. --- rbm.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rbm.conf b/rbm.conf index 5e981ac..23f3598 100644 --- a/rbm.conf +++ b/rbm.conf @@ -53,21 +53,17 @@ var: locales: - ar - ca - - cs - da - de - - el - es-ES - fa - fr - ga-IE - he - - hu - id - is - it - '[% c("var/locale_ja") %]' - - ka - ko - nb-NO - nl

1 0

[tor-browser-build/master] Bug 26696: Add definition for new platform in rbm.conf
by gk＠torproject.org 24 Oct '18

24 Oct '18

commit 51aae94ab13e575ddbcba0cff4dbb9c69c4a612e Author: sisbell <shane.isbell(a)gmail.com> Date: Mon Sep 24 20:37:18 2018 -0700 Bug 26696: Add definition for new platform in rbm.conf --- rbm.conf | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/rbm.conf b/rbm.conf index 7f5dfa4..5e981ac 100644 --- a/rbm.conf +++ b/rbm.conf @@ -141,6 +141,27 @@ targets: # Don't create mar files to save time build_mar: 0 + torbrowser-android-armv7: + - android-armv7 + android-armv7: + arch: armv7 + var: + android: 1 + osname: android-armv7 + compiler: android-toolchain + snowflake: 0 + fteproxy: 0 + container: + suite: stretch + arch: amd64 + deps: + - build-essential + - python + - bison + - automake + - libtool + - zip + - unzip torbrowser-linux-x86_64: - linux-x86_64 - linux

1 0

[tor-browser-build/master] Bug 27441: Add support for stretch in debootstrap-image
by gk＠torproject.org 24 Oct '18

24 Oct '18

commit 5cd65aaa478a41bd8c98a5405a5bf5b82256ca67 Author: sisbell <shane.isbell(a)gmail.com> Date: Tue Sep 25 10:32:39 2018 -0700 Bug 27441: Add support for stretch in debootstrap-image --- projects/debootstrap-image/config | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index 10e2afe..5ee8c9a 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -3,7 +3,7 @@ filename: 'container-image_[% c("var/container/suite") %]-[% c("var/container/ar pkg_type: build var: - ubuntu_version: 16.04.3 + ubuntu_version: 18.04.1 container: use_container: 1 @@ -44,9 +44,13 @@ targets: container: suite: buster arch: amd64 + stretch-amd64: + var: + container: + suite: stretch + arch: amd64 input_files: - URL: 'http://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' - sha256sum: 353b01ac60c43574c4977b1a9b7fe09a43298cb572de1a2090a8f09c5133b4d2 - + sha256sum: ed76e649f65548a80b361b68011085ec4dde7bb762d667657acbef87765e1a12

1 0

[tor-browser-build/master] Revert "Merge remote-tracking branch 'dcf/bug_27827'"
by gk＠torproject.org 19 Oct '18

19 Oct '18

commit 4ae6ba4f9d62113a818e706f63a8c3fb9c011e06 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 19 10:55:55 2018 +0000 Revert "Merge remote-tracking branch 'dcf/bug_27827'" This reverts commit 889be4318d80f11f2b5b2b845ab11868149c48f1, reversing changes made to d8ce7fca64a15cf9b71f7685ef2a8f36dae6a21a. The patch for bug 27827 leads to a busted Linux build. --- projects/go/config | 4 ++-- projects/snowflake/build | 27 +++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/projects/go/config b/projects/go/config index 1841705..2a3b1ad 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.11.1 +version: 1.8.3 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -84,7 +84,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 558f8c169ae215e25b81421596e8de7572bd3ba824b79add22fba6e284db1117 + sha256sum: 5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 diff --git a/projects/snowflake/build b/projects/snowflake/build index a66a1e9..f3616f4 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -30,13 +30,32 @@ cd client [% IF c("var/osx") -%] # Without faketime, snowflake-client would contain the timestamp of the # temporary client.a file created during "go build". - # The -tmpdir flag overrides what would otherwise be a randomly generated - # path, /tmp/go-link-RANDOMNUM/go.o. - mkdir -p /var/tmp/go-link.tmpdir - [% c("var/faketime") %] go build -ldflags '-s -tmpdir /var/tmp/go-link.tmpdir' + [% c("var/faketime") %] go build -ldflags '-s' [% ELSE -%] go build -ldflags '-s' [% END -%] +[% IF c("var/osx") -%] + # Hack: Overwrite variable absolute paths embedded in the binary. clang 3.8.0 + # on Darwin embeds such paths and the issue is unsolved in upstream Go as of + # 2016-06-28: + # https://github.com/golang/go/issues/9206#issuecomment-310476743 + # The two kinds of paths are ("000000000" stands for 9 random digits): + # /tmp/go-build000000000 + # /tmp/go-link-000000000 + # Such paths are the output of ioutil.TempDir("", "go-build") and + # ioutil.TempDir("", "go-link-"). + cp -a client client.stomped + sed -i -E -e 's#(/tmp/go-build|/tmp/go-link-)[0-9]{9}/#\1XXXXXXXXX/#g' client.stomped + # Sanity check: make sure the file actually changed. If it did not, it could + # mean that a change in go or clang has made this step unnecessary. + if cmp client client.stomped + then + echo "No paths replaced in snowflake-client. Maybe the replacement failed or is no longer needed." + echo "Check projects/snowflake/build" + exit 1 + fi + mv -f client.stomped client +[% END -%] cp -a client[% IF c("var/windows") %].exe[% END %] $PTDIR/snowflake-client[% IF c("var/windows") %].exe[% END %] cd ..

1 0

[tor-browser-build/master] Backout patch for #27827 for Linux build bustage
by gk＠torproject.org 19 Oct '18

19 Oct '18

commit 2b270ede9341f8ce496e811f7af9077e3eed9049 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 19 10:58:24 2018 +0000 Backout patch for #27827 for Linux build bustage --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 - rbm.conf | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 3b699d5..38b0b9a 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -21,7 +21,6 @@ Tor Browser 8.5a4 -- October 23 2018 * Bug 28002: Fix the precomplete file in the en-US installer * OS X * Bug 26263: App icon positioned incorrectly in macOS DMG installer window - * Bug 27827: Fix snowflake reproducibility issues * Bug 26475: Fix Stylo related reproducibilitiy issue * Linux * Bug 26475: Fix Stylo related reproducibilitiy issue diff --git a/rbm.conf b/rbm.conf index b68c80a..7f5dfa4 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.5a4' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.5a3 project_name: tor-browser

1 0

[tor-browser-build/master] Clarify Changelog entry
by gk＠torproject.org 19 Oct '18

19 Oct '18

commit 24e8b221333bbbbf6667a5132b195a05ff66935a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 19 07:57:44 2018 +0000 Clarify Changelog entry --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 991d020..3b699d5 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -30,7 +30,7 @@ Tor Browser 8.5a4 -- October 23 2018 * Backport of fixes for bug 1448014, 1458905, 1441345, and 1448305 * Build System * All Platforms - * Bug 27218: Generate multiple bundles in parallel + * Bug 27218: Generate multiple Tor Browser bundles in parallel * Windows * Bug 27320: Build certutil for Windows * OS X

1 0

[tor-browser-build/master] Release preparations for 8.5a4
by gk＠torproject.org 19 Oct '18

19 Oct '18

commit cdf8ea8c1dffc3d0fd00361bc357ce33bc7b55cb Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 19 07:51:37 2018 +0000 Release preparations for 8.5a4 Versions bump and Changelog update --- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 38 ++++++++++++++++++++++ projects/tor-browser/config | 4 +-- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 4 +-- 8 files changed, 47 insertions(+), 9 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index d79eec3..dfdf2c4 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.2.1 + firefox_platform_version: 60.3.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.5 torbrowser_update_channel: alpha diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 03edcee..e189eb9 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2018.8.22 +version: 2018.9.19 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 54ebd96..991d020 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,41 @@ +Tor Browser 8.5a4 -- October 23 2018 + * All Platforms + * Update Firefox to 60.3.0esr + * Update Tor to 0.3.5.3-alpha + * Update Torbutton to 2.1.1 + * Bug 23925+27959: Donation banner for year end 2018 campaign + * Bug 24172: Donation banner clobbers Tor Browser version string + * Bug 28082: Add locales cs, el, hu, ka + * Translations update + * Update Tor Launcher to 0.2.17 + * Bug 27994+25151: Use the new Tor Browser logo + * Bug 28082: Add locales cs, el, hu, ka + * Translations update + * Update HTTPS Everywhere to 2018.9.19 + * Update NoScript to 10.1.9.9 + * Bug 1623: Block protocol handler enumeration (backport of fix for #680300) + * Bug 27905: Fix many occurrences of "Firefox" in about:preferences + * Bug 28082: Add locales cs, el, hu, ka + * Windows + * Bug 21704: Abort install if CPU is missing SSE2 support + * Bug 28002: Fix the precomplete file in the en-US installer + * OS X + * Bug 26263: App icon positioned incorrectly in macOS DMG installer window + * Bug 27827: Fix snowflake reproducibility issues + * Bug 26475: Fix Stylo related reproducibilitiy issue + * Linux + * Bug 26475: Fix Stylo related reproducibilitiy issue + * Bug 28022: Use `/usr/bin/env bash` for bash invocation + * Android + * Backport of fixes for bug 1448014, 1458905, 1441345, and 1448305 + * Build System + * All Platforms + * Bug 27218: Generate multiple bundles in parallel + * Windows + * Bug 27320: Build certutil for Windows + * OS X + * Bug 27320: Build certutil for macOS + Tor Browser 8.5a3 -- October 4 2018 * All platforms * Update Firefox to 60.2.1esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 7b44d8f..bb1c259 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -71,9 +71,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 336ae26d0a70688e6c2b3c14267c9e80f52f6f36c31f23b8242e0edae3666d42 + sha256sum: e7ec0345c2174e64c7552ab708a59c8efd7c1078fedda64d9c9ad06a899194b9 - 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 9e00653..ff5b387 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.16.5 +version: 0.2.17 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 cc7811b..bb743ca 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.3.5.2-alpha +version: 0.3.5.3-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/projects/torbutton/config b/projects/torbutton/config index a698691..b4d50be 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.1 +version: 2.1.1 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 13aec99..b68c80a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5a3' + torbrowser_version: '8.5a4' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.5a2 + - 8.5a3 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0