- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bump clang to 8.0.1
by boklm＠torproject.org 13 Dec '19

13 Dec '19

commit 66768cae1aa05a16f5dbc0a407185a38e610c121 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 12 16:47:15 2019 +0000 Bump clang to 8.0.1 --- keyring/clang.gpg | Bin 7186 -> 2222 bytes keyring/llvm.gpg | Bin 4309 -> 0 bytes projects/clang/config | 14 +++++++------- projects/mingw-w64-clang/config | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/keyring/clang.gpg b/keyring/clang.gpg index 15f0d8a..eba625c 100644 Binary files a/keyring/clang.gpg and b/keyring/clang.gpg differ diff --git a/keyring/llvm.gpg b/keyring/llvm.gpg deleted file mode 100644 index 7c7ab06..0000000 Binary files a/keyring/llvm.gpg and /dev/null differ diff --git a/projects/clang/config b/projects/clang/config index 08231be..67798f8 100644 --- a/projects/clang/config +++ b/projects/clang/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 8.0.0 +version: 8.0.1 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' gpg_keyring: clang.gpg sig_ext: sig @@ -23,22 +23,22 @@ input_files: enable: '[% c("var/linux") %]' - project: cmake name: cmake - - URL: 'https://releases.llvm.org/[% c("version") %]/llvm-[% c("version") %].src.tar.xz' + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/llvm-[% c("version") %].src.tar.xz' name: llvm file_gpg_id: 1 - - URL: 'https://releases.llvm.org/[% c("version") %]/cfe-[% c("version") %].src.tar.xz' + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/cfe-[% c("version") %].src.tar.xz' name: cfe file_gpg_id: 1 - - URL: 'https://releases.llvm.org/[% c("version") %]/libcxx-[% c("version") %].src.tar.xz' + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/libcxx-[% c("version") %].src.tar.xz' name: libcxx file_gpg_id: 1 - - URL: 'https://releases.llvm.org/[% c("version") %]/libcxxabi-[% c("version") %].src.tar.xz' + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/libcxxabi-[% c("version") %].src.tar.xz' name: libcxxabi file_gpg_id: 1 - - URL: 'https://releases.llvm.org/[% c("version") %]/lld-[% c("version") %].src.tar.xz' + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/lld-[% c("version") %].src.tar.xz' name: lld file_gpg_id: 1 - - URL: 'https://releases.llvm.org/[% c("version") %]/compiler-rt-[% c("version") %].src.tar.xz' + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/compiler-rt-[% c("version") %].src.tar.xz' name: compiler-rt file_gpg_id: 1 - filename: win-patches diff --git a/projects/mingw-w64-clang/config b/projects/mingw-w64-clang/config index 32d18a8..11480b9 100644 --- a/projects/mingw-w64-clang/config +++ b/projects/mingw-w64-clang/config @@ -3,7 +3,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 git_hash: 0a1d495478d8ed1a94fc77b9dbb428b7e0372588 version: '[% c("abbrev") %]' -llvm_version: 8.0.0 +llvm_version: 8.0.1 gpg_keyring: clang.gpg sig_ext: sig @@ -21,16 +21,16 @@ input_files: name: clang - project: cmake name: cmake - - URL: 'https://releases.llvm.org/[% c("llvm_version") %]/libcxx-[% c("llvm_version") %].src.tar.xz' + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("llvm_version") %]/libcxx-[% c("llvm_version") %].src.tar.xz' name: libcxx file_gpg_id: 1 - - URL: 'https://releases.llvm.org/[% c("llvm_version") %]/libcxxabi-[% c("llvm_version") %].src.tar.xz' + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("llvm_version") %]/libcxxabi-[% c("llvm_version") %].src.tar.xz' name: libcxxabi file_gpg_id: 1 - - URL: 'https://releases.llvm.org/[% c("llvm_version") %]/libunwind-[% c("llvm_version") %].src.tar.xz' + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("llvm_version") %]/libunwind-[% c("llvm_version") %].src.tar.xz' name: libunwind file_gpg_id: 1 - - URL: 'https://releases.llvm.org/[% c("llvm_version") %]/compiler-rt-[% c("llvm_version") %].src.tar.xz' + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("llvm_version") %]/compiler-rt-[% c("llvm_version") %].src.tar.xz' name: compiler-rt file_gpg_id: 1 - project: llvm-mingw

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_32739'
by boklm＠torproject.org 13 Dec '19

13 Dec '19

commit 7e179ed051a63e5a1ce163ce4facc0a616f0a99a Merge: 8f723ac 66768ca Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 13 11:56:52 2019 +0100 Merge remote-tracking branch 'gk/bug_32739' keyring/clang.gpg | Bin 7186 -> 2222 bytes keyring/llvm.gpg | Bin 4309 -> 0 bytes projects/clang/config | 14 +++++++------- projects/mingw-w64-clang/config | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-)

1 0

[tor-browser-build/maint-9.0] Bug 32741 - Update CMake Git repo URL
by gk＠torproject.org 13 Dec '19

13 Dec '19

commit 13bd5905aca8765316b352478544f16bfdffad48 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Dec 12 22:20:33 2019 +0000 Bug 32741 - Update CMake Git repo URL --- projects/cmake/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/cmake/config b/projects/cmake/config index fd8d186..28afa05 100644 --- a/projects/cmake/config +++ b/projects/cmake/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 version: 3.15.3 -git_url: https://cmake.org/cmake.git +git_url: https://gitlab.kitware.com/cmake/cmake.git git_hash: 'v[% c("version") %]' tag_gpg_id: 1 gpg_keyring: cmake.gpg

1 0

[tor-browser-build/master] Bug 32741 - Update CMake Git repo URL
by gk＠torproject.org 13 Dec '19

13 Dec '19

commit 8f723ac38a8b715adcffe978fcfba70c0f499dd0 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Dec 12 22:20:33 2019 +0000 Bug 32741 - Update CMake Git repo URL --- projects/cmake/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/cmake/config b/projects/cmake/config index fd8d186..28afa05 100644 --- a/projects/cmake/config +++ b/projects/cmake/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 version: 3.15.3 -git_url: https://cmake.org/cmake.git +git_url: https://gitlab.kitware.com/cmake/cmake.git git_hash: 'v[% c("version") %]' tag_gpg_id: 1 gpg_keyring: cmake.gpg

1 0

[tor-browser-build/master] Add sysrqb to nightly build emails
by boklm＠torproject.org 12 Dec '19

12 Dec '19

commit cb114218a4d8a2270ba7aac4ee7a03ea950c5d6e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Dec 12 15:21:54 2019 +0100 Add sysrqb to nightly build emails --- tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml index 01f1e16..0d19cff 100644 --- a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml +++ b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml @@ -2,4 +2,4 @@ nightly_build_hostname: f4amtbsowhix7rrf.onion nightly_build_url: 'http://{{ nightly_build_hostname }}' nightly_build_email_from: "'Tor Browser Nightly Builds (boklm) <boklm-tbb-nightly(a)riseup.net>'," -nightly_build_email_to: "[ 'boklm(a)torproject.org', ]," +nightly_build_email_to: "[ 'boklm(a)torproject.org', 'sysrqb(a)torproject.org', ],"

1 0

[tor-browser-build/master] Bug 32738: Use any of the mar-tools available
by gk＠torproject.org 12 Dec '19

12 Dec '19

commit 25d9f797f4d2b1313ea396fada5b7cfb77c8232c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Dec 12 13:02:24 2019 +0100 Bug 32738: Use any of the mar-tools available If the linux64 mar-tools is not available, use any of the other mar-tools that is available. --- tools/update-responses/update_responses | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 3dfd05d..399d289 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -429,24 +429,19 @@ sub write_downloads_json { } } -sub osname { - my ($osname) = capture_exec('uname', '-s'); - my ($arch) = capture_exec('uname', '-m'); - chomp($osname, $arch); - if ($osname eq 'Linux' && $arch eq 'x86_64') { - return 'linux64'; - } - if ($osname eq 'Linux' && $arch =~ m/^i.86$/) { - return 'linux32'; +sub marzip_path { + my ($config, $version) = @_; + for my $osname (qw/linux64 linux32 mac64 win64 win32/) { + my $marzip = version_dir($config, $version) . "/mar-tools-$osname.zip"; + return $marzip if -f $marzip; } - exit_error 'Unknown OS'; + exit_error 'Could not find mar-tools'; } my $martools_tmpdir; sub extract_martools { my ($config, $version) = @_; - my $osname = osname; - my $marzip = version_dir($config, $version) . "/mar-tools-$osname.zip"; + my $marzip = marzip_path($config, $version); $martools_tmpdir = get_tmpdir($config); my $old_cwd = getcwd; chdir $martools_tmpdir; @@ -566,7 +561,7 @@ sub download_version { my %sums = map { chomp; reverse split ' ', $_ } read_file "$destdir/sha256sums-signed-build.txt"; - my $martools = 'mar-tools-' . osname . '.zip'; + my $martools = 'mar-tools-linux64.zip'; exit_error "Error downloading $urldir/$martools\n" unless getstore("$urldir/$martools", "$tmpdir/$martools") == 200; exit_error "Error downloading $urldir/$martools.asc\n"

1 0

[tor-browser-build/master] Remove GeKo from nightly build emails
by boklm＠torproject.org 12 Dec '19

12 Dec '19

commit 3f5fe6ac613012297d00cc4567e7c19bcb661e04 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Dec 12 11:18:27 2019 +0100 Remove GeKo from nightly build emails Asked by GeKo on IRC. --- tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml index 77c4ad6..01f1e16 100644 --- a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml +++ b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml @@ -2,4 +2,4 @@ nightly_build_hostname: f4amtbsowhix7rrf.onion nightly_build_url: 'http://{{ nightly_build_hostname }}' nightly_build_email_from: "'Tor Browser Nightly Builds (boklm) <boklm-tbb-nightly(a)riseup.net>'," -nightly_build_email_to: "[ 'boklm(a)torproject.org', 'gk(a)torproject.org' ]," +nightly_build_email_to: "[ 'boklm(a)torproject.org', ],"

1 0

[tor-browser-build/master] Bug 31130: Use Debian 10 for our Android container images
by gk＠torproject.org 12 Dec '19

12 Dec '19

commit 26be3f16054b7d9b1c4c6cf0332d90f92511fc3e Author: sisbell <shane.isbell(a)gmail.com> Date: Tue Oct 22 10:21:32 2019 -0700 Bug 31130: Use Debian 10 for our Android container images --- projects/debootstrap-image/config | 17 +++++++++-------- projects/firefox/build | 1 + projects/firefox/config | 5 ----- projects/https-everywhere/config | 1 + projects/tor-android-service/config | 6 ------ projects/tor-browser/build.android | 2 +- projects/tor-browser/config | 1 - projects/tor-onion-proxy-library/config | 6 ------ rbm.conf | 13 +++++++++++-- 9 files changed, 23 insertions(+), 29 deletions(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index a50cbf1..f7b9e57 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -4,7 +4,7 @@ version: 2 pkg_type: build var: - ubuntu_version: 18.04.1 + ubuntu_version: 19.10 container: use_container: 1 @@ -15,8 +15,6 @@ pre: | #!/bin/sh set -e export DEBIAN_FRONTEND=noninteractive - # Bug 29158: install fixed packages for apt vulnerability (CVE-2019-3462) - dpkg -i ./apt_1.6.6ubuntu0.1_amd64.deb ./libapt-pkg5.0_1.6.6ubuntu0.1_amd64.deb apt-get update -y -q apt-get install -y -q debian-archive-keyring ubuntu-keyring debootstrap debootstrap --arch=[% c("var/container/arch") %] [% c("var/container/debootstrap_opt") %] [% c("var/container/suite") %] base-image [% c("var/container/debootstrap_mirror") %] @@ -65,14 +63,17 @@ targets: suite: stretch arch: amd64 + buster-amd64: + var: + minimal_apt_version: 1.8.2 + container: + suite: buster + 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: ed76e649f65548a80b361b68011085ec4dde7bb762d667657acbef87765e1a12 - - URL: http://security.ubuntu.com/ubuntu/pool/main/a/apt/apt_1.6.6ubuntu0.1_amd64.… - sha256sum: df210f9e30cf9deba5fbe815203af854e5e77bdbbe0b96d0d1c0da46a6a8dd0a - - URL: http://security.ubuntu.com/ubuntu/pool/main/a/apt/libapt-pkg5.0_1.6.6ubuntu… - sha256sum: 0a05a97b1e9b8d52ee8df040a14c5fabdebbb2c2235ac495db29df34f4c8cec3 + sha256sum: eedcb1dc0ccc86b59eb1f89960c322a2ba3ed3e0323a20a1da8bcc0e6f100f4f - URL: '[% c("var/apt_packages_baseurl") %]/[% c("var/apt_package_filename") %]' sha256sum: '[% c("var/apt_package_sha256sum") %]' enable: '[% c("var/apt_package_filename") %]' diff --git a/projects/firefox/build b/projects/firefox/build index 456aa07..b89e404 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -57,6 +57,7 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig [% END -%] [% IF c("var/android") %] + export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64 gradle_repo=/var/tmp/dist/gradle-dependencies export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo" export GRADLE_FLAGS="--no-daemon --offline" diff --git a/projects/firefox/config b/projects/firefox/config index 1af3014..74dbc78 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -57,11 +57,6 @@ targets: torbrowser_update_channel: default branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/nightly' - android: - var: - arch_deps: - - openjdk-8-jdk - linux: var: post_pkginst: | diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 6232669..3206491 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -27,6 +27,7 @@ var: - rsync - zip - unzip + pre_pkginst: '' input_files: - project: container-image diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 492a3e1..296d1e5 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -13,12 +13,6 @@ var: # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 3 -targets: - android: - var: - arch_deps: - - openjdk-8-jdk - input_files: - project: container-image - name: '[% c("var/compiler") %]' diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index f8f3a8d..751db11 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -55,4 +55,4 @@ cd tmp }) %] # Sign a QA build. This apk is not a debug version and doesn't contain a debug flag in the manifest -java -jar /usr/share/apksigner/apksigner.jar sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $qa_apk --in $apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android +java -jar /usr/lib/android-sdk/build-tools/debian/apksigner.jar sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $qa_apk --in $apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android diff --git a/projects/tor-browser/config b/projects/tor-browser/config index f78b4f8..09fe15f 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -45,7 +45,6 @@ targets: build: '[% INCLUDE build.android %]' var: arch_deps: - - openjdk-8-jdk - apksigner input_files: diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index c2bd1a4..7029c07 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -15,12 +15,6 @@ var: # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 3 -targets: - android: - var: - arch_deps: - - openjdk-8-jdk - input_files: - project: container-image - name: '[% c("var/compiler") %]' diff --git a/rbm.conf b/rbm.conf index 727c09f..0ed6841 100644 --- a/rbm.conf +++ b/rbm.conf @@ -220,7 +220,7 @@ targets: android_min_api_x86_64: 21 snowflake: 0 container: - suite: stretch + suite: buster arch: amd64 deps: - build-essential @@ -229,7 +229,16 @@ targets: - libtool - zip - unzip - + pre_pkginst: | + SNAPSHOT_VERSION=20191201T212855Z + OPENJDK_URL=https://snapshot.debian.org/archive/debian/$SNAPSHOT_VERSION/po… + JDK_VERSION=8u232-b09-1~deb9u1_amd64 + apt-get install -y -q wget ca-certificates-java + wget $OPENJDK_URL/openjdk-8-jdk-headless_$JDK_VERSION.deb + wget $OPENJDK_URL/openjdk-8-jre-headless_$JDK_VERSION.deb + echo 92b4f8fb77d793a86e0b03b3b0750592b40a26a5d75956d10dd984a7b3aad4c9 openjdk-8-jdk-headless_$JDK_VERSION.deb | sha256sum -c + echo 84bf52b6cce20ead08b0d5b9fd9b81b4aa3da385ca951b313fe11d5cb1aa4d17 openjdk-8-jre-headless_$JDK_VERSION.deb | sha256sum -c + dpkg -i ./openjdk-8-jre-headless_$JDK_VERSION.deb ./openjdk-8-jdk-headless_$JDK_VERSION.deb torbrowser-linux-x86_64: - linux-x86_64 - linux

1 0

[tor-browser-build/master] Merge remote-tracking branch 'sisbell/bug-31130h'
by gk＠torproject.org 12 Dec '19

12 Dec '19

commit 757acf012f08b6c68ed037ea095922b505e7f17e Merge: b6aeb06 26be3f1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 12 07:11:27 2019 +0000 Merge remote-tracking branch 'sisbell/bug-31130h' projects/debootstrap-image/config | 17 +++++++++-------- projects/firefox/build | 1 + projects/firefox/config | 5 ----- projects/https-everywhere/config | 1 + projects/tor-android-service/config | 6 ------ projects/tor-browser/build.android | 2 +- projects/tor-browser/config | 1 - projects/tor-onion-proxy-library/config | 6 ------ rbm.conf | 13 +++++++++++-- 9 files changed, 23 insertions(+), 29 deletions(-) diff --cc projects/firefox/config index c6f840b,74dbc78..2c7c037 --- a/projects/firefox/config +++ b/projects/firefox/config @@@ -52,13 -54,9 +52,8 @@@ targets git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 var: - torbrowser_update_channel: default branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/nightly' - android: - var: - arch_deps: - - openjdk-8-jdk - linux: var: post_pkginst: | diff --cc rbm.conf index 0fe7acb,0ed6841..f94cf4a --- a/rbm.conf +++ b/rbm.conf @@@ -233,10 -219,8 +233,10 @@@ targets android_min_api_x86: 16 android_min_api_x86_64: 21 snowflake: 0 + CC: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang' + CXX: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang++' container: - suite: stretch + suite: buster arch: amd64 deps: - build-essential

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_26861'
by gk＠torproject.org 10 Dec '19

10 Dec '19

commit b6aeb0654a1e97feae322f2249b2a15d5b995085 Merge: f017571 b7035b0 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 10 19:53:12 2019 +0000 Merge remote-tracking branch 'boklm/bug_26861' projects/common/runc-config.json | 7 ------- 1 file changed, 7 deletions(-)

1 0

[tor-browser-build/master] Bug 26861: don't set RLIMIT_NOFILE in containers
by gk＠torproject.org 10 Dec '19

10 Dec '19

commit b7035b046a06b63edb2ca07e6e8d7afe3a5dc0bd Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 25 12:22:59 2018 +0200 Bug 26861: don't set RLIMIT_NOFILE in containers --- projects/common/runc-config.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/projects/common/runc-config.json b/projects/common/runc-config.json index e75c13d..e5c4f28 100644 --- a/projects/common/runc-config.json +++ b/projects/common/runc-config.json @@ -119,13 +119,6 @@ "CAP_CHOWN" ], [% END -%] - "rlimits": [ - { - "type": "RLIMIT_NOFILE", - "hard": 1024, - "soft": 1024 - } - ], "noNewPrivileges": true }, "root": {

1 0

[tor-browser/tor-browser-68.3.0esr-9.5-1] fixup! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 10 Dec '19

10 Dec '19

commit cb3038cf717f25e759fb3fdc0a8e941dbfc4e0f1 Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Dec 9 16:55:21 2019 -0800 fixup! TB3: Tor Browser's official .mozconfigs. --- .mozconfig | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.mozconfig b/.mozconfig index 9383f1ad1a73..b4c5440304ac 100755 --- a/.mozconfig +++ b/.mozconfig @@ -1,5 +1,14 @@ . $topsrcdir/browser/config/mozconfig +# This mozconfig file is not used in official Tor Browser builds. +# It is only intended to be used when doing incremental Linux builds +# during development. The platform-specific mozconfig configuration +# files used in official Tor Browser releases can be found in the +# tor-browser-build repo: +# https://gitweb.torproject.org/builders/tor-browser-build.git/ +# under: +# tor-browser-build/projects/firefox/mozconfig-$OS-$ARCH + mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" export MOZILLA_OFFICIAL=1 @@ -10,7 +19,8 @@ ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 ac_add_options --enable-default-toolkit=cairo-gtk3 -ac_add_options --enable-tor-browser-update +ac_add_options --disable-tor-launcher +ac_add_options --disable-tor-browser-update ac_add_options --enable-signmar ac_add_options --enable-verify-mar @@ -25,4 +35,6 @@ ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection # Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= \ No newline at end of file +ac_add_options MOZ_TELEMETRY_REPORTING= + +ac_add_options --with-tor-browser-version=dev-build

1 0

[tor-browser-build/maint-9.0] Bug 32676: Create a tarball with all Linux x86_64 language packs.
by gk＠torproject.org 09 Dec '19

09 Dec '19

commit 26d96cf4284c524f1b620bcd59b370fb0f3001db Author: intrigeri <intrigeri(a)boum.org> Date: Thu Dec 5 18:22:57 2019 +0000 Bug 32676: Create a tarball with all Linux x86_64 language packs. This will significantly improve the quality of life of Tails release managers and developers. Thanks to boklm for the help! --- projects/tor-browser/build | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 67419a8..cf31331 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -274,6 +274,17 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.xz "$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.xz [% END -%] +# Create a tarball with all Linux x86_64 language packs (Bug 32676) +[% IF c("var/release") && c("var/linux-x86_64") && ! c("var/multi_lingual") && ! c("var/testbuild") -%] + pushd $rootdir/[% c('input_files_by_name/firefox-langpacks') %] + [% c('tar', { + tar_src => [ '.' ], + tar_args => '-cJf $OUTDIR/langpacks-tor-browser-linux64-' _ c("var/torbrowser_version") _ '.tar.xz', + }) + %] + popd +[% END -%] + # If we did not create a multi-lingual package above, create a package for # each locale. [% IF ! c("var/multi_lingual") %]

1 0

[tor-browser-build/master] Bug 32676: Create a tarball with all Linux x86_64 language packs.
by gk＠torproject.org 09 Dec '19

09 Dec '19

commit f01757118ffd65096a66d73dec47cb747b0ac6a4 Author: intrigeri <intrigeri(a)boum.org> Date: Thu Dec 5 18:22:57 2019 +0000 Bug 32676: Create a tarball with all Linux x86_64 language packs. This will significantly improve the quality of life of Tails release managers and developers. Thanks to boklm for the help! --- projects/tor-browser/build | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 0869f50..2979658 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -274,6 +274,17 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.xz "$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.xz [% END -%] +# Create a tarball with all Linux x86_64 language packs (Bug 32676) +[% IF c("var/release") && c("var/linux-x86_64") && ! c("var/multi_lingual") && ! c("var/testbuild") -%] + pushd $rootdir/[% c('input_files_by_name/firefox-langpacks') %] + [% c('tar', { + tar_src => [ '.' ], + tar_args => '-cJf $OUTDIR/langpacks-tor-browser-linux64-' _ c("var/torbrowser_version") _ '.tar.xz', + }) + %] + popd +[% END -%] + # If we did not create a multi-lingual package above, create a package for # each locale. [% IF ! c("var/multi_lingual") %]

1 0

[tor-browser-build/master] Fix ChangeLog
by boklm＠torproject.org 05 Dec '19

05 Dec '19

commit a1ee4a5574237e54ebef4ec94721c8a944e36ec6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Dec 5 10:07:34 2019 +0100 Fix ChangeLog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index de4b926..d9ecbbf 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -9,7 +9,7 @@ Tor Browser 9.5a3 -- December 3 2019 * Bug 32606: Set up default bridge at Georgetown University * Bug 30787: Add lt locale * Bug 30788: Add ms locale - * Bug 30787: Add th locale + * Bug 30786: Add th locale * Translations update * Bug 28746: Remove torbutton isolation and fp prefs sync * Bug 28745: Assume always running in Tor Browser @@ -22,7 +22,7 @@ Tor Browser 9.5a3 -- December 3 2019 * Update Tor Launcher to 0.2.20.3 * Bug 30787: Add lt locale * Bug 30788: Add ms locale - * Bug 30787: Add th locale + * Bug 30786: Add th locale * Bug 30237: Improve TBB UI of hidden service client authorization * Android * Bug 32365: Localization is broken in Tor Browser 9 on Android

1 0

[tor-browser-build/master] Fold in stable changelog for 9.0.2
by gk＠torproject.org 04 Dec '19

04 Dec '19

commit a3fefb738f2a91cb239325ceb8c585ce44673f23 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 4 10:56:07 2019 +0000 Fold in stable changelog for 9.0.2 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index a08e22e..de4b926 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -32,6 +32,27 @@ Tor Browser 9.5a3 -- December 3 2019 * Windows * Bug 32616: Disable GetSecureOutputDirectoryPath() functionality +Tor Browser 9.0.2 -- December 3 2019 + * All Platforms + * Update Firefox to 68.3.0esr + * Bump NoScript to 11.0.9 + * Bug 32362: NoScript TRUSTED setting doesn't work + * Bug 32429: Issues with about:blank and NoScript on .onion sites + * Bump HTTPS Everywhere to 2019.11.7 + * Bug 27268: Preferences clean-up in Torbutton code + * Translations update + * Windows + OS X + Linux + * Bug 32125: Fix circuit display for bridge without a fingerprint + * Bug 32250: Backport enhanced letterboxing support (bug 1546832 and 1556017) + * Windows + * Bug 31989: Backport backout of old mingw-gcc patch + * Bug 32616: Disable GetSecureOutputDirectoryPath() functionality + * Android + * Bug 32365: Localization is broken in Tor Browser 9 on Android + * Build System + * All Platforms + * Bug 32413: Bump Go version to 1.12.13 + Tor Browser 9.5a2 -- November 11 2019 * All Platforms * Update NoScript to 11.0.7

1 0

[tor-browser-build/maint-9.0] Bug 32659: Remove IPv6 address of default bridge.
by gk＠torproject.org 03 Dec '19

03 Dec '19

commit e1a0befdb0af9861c66115cfc613db6dc79b210d Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Dec 2 08:42:04 2019 -0800 Bug 32659: Remove IPv6 address of default bridge. The default bridge CDF2E852BF539B82BD10E27E9115A31734E378C2 has both an IPv4 and IPv6 address but it is no longer reachable over it's IPv6 address, so it's time to remove it. This fixes <https://bugs.torproject.org/32659>. --- .../Bundle-Data/PTConfigs/bridge_prefs.js | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index fae920a..0004046 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -5,17 +5,16 @@ pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4"); pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); /**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.3"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/maint-9.0] Pick up latest tor-android-service for #32659
by gk＠torproject.org 03 Dec '19

03 Dec '19

commit fb95108e6bb7c61661e4624de952b521d3412981 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 3 08:57:53 2019 +0000 Pick up latest tor-android-service for #32659 --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index d63b778..669733b 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 3d3de669452f563f3f7b58f57f757f7a7cdae621 +git_hash: 1a2f8b9d7e4d10b2057eee0e68d5aacc5d26f8ae git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-browser-build/master] Pick up latest tor-android-service for #32659
by gk＠torproject.org 03 Dec '19

03 Dec '19

commit fd460ada3d9af6e2b93045cd0f6f5996e7654b36 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 3 08:57:53 2019 +0000 Pick up latest tor-android-service for #32659 --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 4611757..9d7bc84 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 3d3de669452f563f3f7b58f57f757f7a7cdae621 +git_hash: 1a2f8b9d7e4d10b2057eee0e68d5aacc5d26f8ae git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-browser-build/master] Bug 32659: Remove IPv6 address of default bridge.
by gk＠torproject.org 03 Dec '19

03 Dec '19

commit 8904bff35ab4cce37ce5397b9eb98d2eefca2843 Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Dec 2 08:42:04 2019 -0800 Bug 32659: Remove IPv6 address of default bridge. The default bridge CDF2E852BF539B82BD10E27E9115A31734E378C2 has both an IPv4 and IPv6 address but it is no longer reachable over it's IPv6 address, so it's time to remove it. This fixes <https://bugs.torproject.org/32659>. --- .../Bundle-Data/PTConfigs/bridge_prefs.js | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index fae920a..0004046 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -5,17 +5,16 @@ pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4"); pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); /**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.3"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-android-service/master] Bug 32659: Remove IPv6 address of default bridge.
by gk＠torproject.org 03 Dec '19

03 Dec '19

commit 1a2f8b9d7e4d10b2057eee0e68d5aacc5d26f8ae Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Dec 2 08:44:32 2019 -0800 Bug 32659: Remove IPv6 address of default bridge. The default bridge CDF2E852BF539B82BD10E27E9115A31734E378C2 has both an IPv4 and IPv6 address but it is no longer reachable over it's IPv6 address, so it's time to remove it. This fixes <https://bugs.torproject.org/32659>. --- service/src/main/assets/common/bridges.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/service/src/main/assets/common/bridges.txt b/service/src/main/assets/common/bridges.txt index 02a3926..36ed076 100644 --- a/service/src/main/assets/common/bridges.txt +++ b/service/src/main/assets/common/bridges.txt @@ -1,6 +1,5 @@ obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1 obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1 -obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1 obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1 obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0 obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0

1 0

[tor-browser-build/master] Fix up ChangeLog and set tor-browser build
by sysrqb＠torproject.org 30 Nov '19

30 Nov '19

commit da553a6a2183c881841e0c2f1fd752c10156d0b6 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sat Nov 30 21:17:51 2019 +0000 Fix up ChangeLog and set tor-browser build --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 34f7202..c6f840b 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-build1' 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 3edd1c8..a08e22e 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -11,14 +11,22 @@ Tor Browser 9.5a3 -- December 3 2019 * Bug 30788: Add ms locale * Bug 30787: Add th locale * Translations update + * Bug 28746: Remove torbutton isolation and fp prefs sync + * Bug 28745: Assume always running in Tor Browser + * Bug 30888: move torbutton_util.js to modules/utils.js + * Bug 30851: Move default preferences to 000-tor-browser.js + * Bug 28745: Remove torbutton.js unused code + * Bug 32255: Missing ORIGIN header breaks CORS * Windows + OS X + Linux * Update Tor to 0.4.2.4-rc * Update Tor Launcher to 0.2.20.3 * Bug 30787: Add lt locale - * Bug 30788: Add ms locale - * Bug 30787: Add th locale + * Bug 30788: Add ms locale + * Bug 30787: Add th locale + * Bug 30237: Improve TBB UI of hidden service client authorization * Android * Bug 32365: Localization is broken in Tor Browser 9 on Android + * Bug 32405: Crash immediately after bootstrap on Android * OS X * Bug 32505: Tighten our rules in our entitlements file for macOS * Windows

1 0

[tor-browser-build/master] Bug 30788: Add ms locale
by sysrqb＠torproject.org 30 Nov '19

30 Nov '19

commit 5433d1992cf2fe33570ec00f73609756d2afc6f8 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 26 08:33:34 2019 +0000 Bug 30788: Add ms locale --- rbm.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/rbm.conf b/rbm.conf index af7c4a1..c7364fa 100644 --- a/rbm.conf +++ b/rbm.conf @@ -84,6 +84,7 @@ var: - ko - lt - mk + - ms - nb-NO - nl - pl

1 0

[tor-browser-build/master] Bug 30787: Add lt locale
by sysrqb＠torproject.org 30 Nov '19

30 Nov '19

commit 3939583d6f7faf402d324ac63f7c2a02404527fc Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 25 09:20:23 2019 +0000 Bug 30787: Add lt locale --- rbm.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/rbm.conf b/rbm.conf index 018df39..af7c4a1 100644 --- a/rbm.conf +++ b/rbm.conf @@ -82,6 +82,7 @@ var: - '[% c("var/locale_ja") %]' - ka - ko + - lt - mk - nb-NO - nl

1 0

[tor-browser-build/master] Update rbm for #32527
by sysrqb＠torproject.org 30 Nov '19

30 Nov '19

commit 95ae652f853e3966c11bef45070595e62f6c375c Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sat Nov 30 20:29:19 2019 +0000 Update rbm for #32527 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- rbm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 3c8260a..3edd1c8 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -17,12 +17,12 @@ Tor Browser 9.5a3 -- December 3 2019 * Bug 30787: Add lt locale * Bug 30788: Add ms locale * Bug 30787: Add th locale - * Windows - * Bug 32616: Disable GetSecureOutputDirectoryPath() functionality * Android * Bug 32365: Localization is broken in Tor Browser 9 on Android * OS X * Bug 32505: Tighten our rules in our entitlements file for macOS + * Windows + * Bug 32616: Disable GetSecureOutputDirectoryPath() functionality Tor Browser 9.5a2 -- November 11 2019 * All Platforms diff --git a/rbm b/rbm index 03d53fc..94fce31 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 03d53fcb0444fe9d752719bfbb62e3658d15d26d +Subproject commit 94fce31e54d3fd491cdb3e3b9401919c0e841360

1 0