- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-78.3.0esr-10.0-2] Revert "fixup! TB4: Tor Browser's Firefox preference overrides."
by sysrqb＠torproject.org 19 Sep '20

19 Sep '20

commit fb9428098b5b85eed400daa6e0010ac63faf8848 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sat Sep 19 17:03:53 2020 +0000 Revert "fixup! TB4: Tor Browser's Firefox preference overrides." This reverts commit c386fb3312237fd6c0d123ba9aaad662f8740e56. We continue using the old webextensions storage backend due to #40137. --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index bac98ce06540..7e29c788b720 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -286,6 +286,8 @@ pref("extensions.htmlaboutaddons.recommendations.enabled", false); pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},torbutton(a)torproject.org"); // Bug 26114: Allow NoScript to access addons.mozilla.org etc. pref("extensions.webextensions.restrictedDomains", ""); +// Bug 31396: Disable indexedDB WebExtension storage backend. +pref("extensions.webextensions.ExtensionStorageIDB.enabled", false); // Bug 28896: Make sure our bundled WebExtensions are running in Private Browsing Mode pref("extensions.allowPrivateBrowsingByDefault", true);

1 0

[tor-browser-build/master] Release preparations for 10.5a1
by sysrqb＠torproject.org 18 Sep '20

18 Sep '20

commit 4aebdf97daf19e49c561658f818f38414a9d7b94 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Sep 18 21:28:39 2020 +0000 Release preparations for 10.5a1 Versions bump and Changelog update --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 16 ++++++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- rbm.conf | 6 +++--- 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index fe5081e..07a0200 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 c13d834..8b2d6fd 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,19 @@ +Tor Browser 10.5a1 -- September 22 2020 + * Windows + OS X + Linux + * Update Firefox to 78.3.0esr + * Update Tor to 0.4.4.5 + * Update Tor Launcher to 0.2.25 + * Translations update + * Update NoScript to 11.0.44 + * Bug 40093: Youtube videos on safer produce an error [tor-browser] + * Translations update + * Linux + * Bug 40089: Remove CentOS 6 support for Tor Browser 10.5 [tor-browser] + * Build System + * Linux + * Bug 40041: Remove CentOS 6 support for 10.5 series [tor-browser-build] + * Bug 26238: Move to Debian Jessie for our Linux builds [tor-browser-build] + Tor Browser 10.0a7 -- September 14 2020 * Windows + OS X + Linux * Update Tor Launcher to 0.2.24 diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 7c2baba..8bb1a67 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -77,9 +77,9 @@ input_files: enable: '[% c("var/snowflake") && ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - 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: 79395f62e7df98813847e1ffb28ec33e8271dbf826646b022917d13126a29414 + sha256sum: 3b768fa45f94bed9c58962bd7c0c11bc431e639aeedb2e91c7d8303df5fc84ae - 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 91c181e..f8828db 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.24 +version: 0.2.25 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 b11345c..429e7d6 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.4.4-rc +version: 0.4.4.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 ecd404f..bd02216 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.0a7' - torbrowser_build: 'build3' + torbrowser_version: '10.5a1' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 10.0a6 + - 10.0a7 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Bug 26238: Move to Debian Jessie for our Linux builds
by gk＠torproject.org 18 Sep '20

18 Sep '20

commit 6c9cf92fdb156a18c713fc7b56774725a3ce4f6a Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 12 14:13:16 2020 +0000 Bug 26238: Move to Debian Jessie for our Linux builds Additionally, we clean up our projects removing Linux workarounds not needed under Jessie anymore. --- README.BUILD_ERRORS | 26 -------------------------- projects/binutils/build | 5 ----- projects/clang/build | 1 - projects/container-image/config | 4 ++-- projects/debootstrap-image/config | 27 +++++++++++++-------------- projects/fenix-clang/build | 1 - projects/fenix-rust/config | 6 ++---- projects/firefox/config | 9 --------- projects/rust/config | 6 ++---- rbm.conf | 2 +- 10 files changed, 20 insertions(+), 67 deletions(-) diff --git a/README.BUILD_ERRORS b/README.BUILD_ERRORS index 03f2450..83f2257 100644 --- a/README.BUILD_ERRORS +++ b/README.BUILD_ERRORS @@ -4,32 +4,6 @@ This file lists some common build errors and their solutions. Error starting remote --------------------- -If you have an error like this: - ----- -Error: Error starting remote: -/bin/sh: 1: adduser: not found -Segmentation fault (core dumped) ----- - -You might be having this issue: -https://github.com/docker/docker/issues/28705 - -When the kernel is configured with CONFIG_LEGACY_VSYSCALL_NONE, running -Debian Wheezy containers fails with a segfault. This should be fixed by -adding "vsyscall=emulate"to the kernel cmdline. - -If you are building inside Qubes, you can change the kernel cmdline for -the VM you are using with something like this in dom0: - ----- -$ qvm-pref --get [vmname] kernelopts -nopat -$ qvm-pref --set [vmname] kernelopts 'nopat vsyscall=emulate' ----- - - - If you have an error like this: ---- diff --git a/projects/binutils/build b/projects/binutils/build index 6c01d27..9161192 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -8,11 +8,6 @@ distdir=/var/tmp/dist/binutils export DEB_BUILD_HARDENING_FORTIFY=1 export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 - # The libstdc++ shipped by default is non-PIC which breaks the binutils build - # if we build with DEB_BUILD_HARDENING_PIE=1. We need to install a PIC one AND - # make sure it gets used before the non-PIC one would. - ln -s /usr/lib/gcc/x86_64-linux-gnu/4.7/libstdc++_pic.a libstdc++.a - export LDFLAGS="-L$rootdir -lstdc++" [% END %] tar xf [% project %]-[% c("version") %].tar.xz cd [% project %]-[% c("version") %] diff --git a/projects/clang/build b/projects/clang/build index 33688e5..10700ce 100644 --- a/projects/clang/build +++ b/projects/clang/build @@ -22,7 +22,6 @@ mkdir build cd build cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \ -DCMAKE_BUILD_TYPE:STRING=Release \ - [% IF c("var/linux") -%]-DCOMPILER_RT_BUILD_CRT=OFF \[% END -%] [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%] $LLVM_HOME make -j[% c("buildconf/num_procs") %] diff --git a/projects/container-image/config b/projects/container-image/config index effcdf3..3abba6c 100644 --- a/projects/container-image/config +++ b/projects/container-image/config @@ -10,8 +10,8 @@ var: lsb_release: id: Debian - codename: wheezy - release: 7.11 + codename: jessie + release: 8.11 targets: no_containers: diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index ecd55e1..7dc534a 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -37,24 +37,23 @@ pre: | tar -C ./base-image -czf [% dest_dir %]/[% c("filename") %] . targets: - wheezy-amd64: + jessie-amd64: var: - minimal_apt_version: '0.9.7.9+deb7u9' - # https://deb.freexian.com/extended-lts/updates/ela-76-1-apt/ - apt_packages_baseurl: http://deb.freexian.com/extended-lts/pool/main/a/apt - apt_package_filename: apt_0.9.7.9+deb7u9_amd64.deb - apt_package_sha256sum: b8a218da2ae21979323dd02551d983938d94308ac56930a2d238e822f062dc61 - apt_utils_package_filename: apt-utils_0.9.7.9+deb7u9_amd64.deb - apt_utils_package_sha256sum: d635a166aae03b24cdabe277bb46d584156836637c0b9bef2220fb0bc0928e40 - libapt_inst_package_filename: libapt-inst1.5_0.9.7.9+deb7u9_amd64.deb - libapt_inst_package_sha256sum: 332083172e00d39e55dec4c7078c3522989e45e12b0a1306889e90b8e2c0a0db - libapt_pkg_package_filename: libapt-pkg4.12_0.9.7.9+deb7u9_amd64.deb - libapt_pkg_package_sha256sum: c3ae83c4ea691074250bf6fb175e71042c4bb7418bf19779ceda0a53eea0a257 + minimal_apt_version: 1.0.9.8.6 + # https://lists.debian.org/debian-lts-announce/2020/05/msg00013.html + apt_packages_baseurl: https://deb.freexian.com/extended-lts/pool/main/a/apt + apt_package_filename: apt_1.0.9.8.6_amd64.deb + apt_package_sha256sum: f82ba7ad03a33bed6644777260d28156a0ed0119aeafe657ef1f849330455f5b + apt_utils_package_filename: apt-utils_1.0.9.8.6_amd64.deb + apt_utils_package_sha256sum: 14cb23047ef9d83b0d026c4d5b0eb5e7b06cca36067d19155e9ea14982b09d61 + libapt_inst_package_filename: libapt-inst1.5_1.0.9.8.6_amd64.deb + libapt_inst_package_sha256sum: 332b7453774ad3d141ce459d0c7a8438f16588c0df987e13c388b45740142c76 + libapt_pkg_package_filename: libapt-pkg4.12_1.0.9.8.6_amd64.deb + libapt_pkg_package_sha256sum: c2e17b87284e8c7e162a390d8bba08870729040c2ec0e73eb6631b846dd013c0 container: - suite: wheezy + suite: jessie arch: amd64 - debootstrap_mirror: "http://archive.debian.org/debian/" buster-amd64: var: diff --git a/projects/fenix-clang/build b/projects/fenix-clang/build index 33688e5..10700ce 100644 --- a/projects/fenix-clang/build +++ b/projects/fenix-clang/build @@ -22,7 +22,6 @@ mkdir build cd build cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \ -DCMAKE_BUILD_TYPE:STRING=Release \ - [% IF c("var/linux") -%]-DCOMPILER_RT_BUILD_CRT=OFF \[% END -%] [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%] $LLVM_HOME make -j[% c("buildconf/num_procs") %] diff --git a/projects/fenix-rust/config b/projects/fenix-rust/config index 7dc240a..0f08463 100644 --- a/projects/fenix-rust/config +++ b/projects/fenix-rust/config @@ -46,7 +46,7 @@ targets: # # `--enable-extended` to build not only rustc but cargo as well # - # `--enable-llvm-static-stdccp` to take a libstdc++ on Wheezy into account + # `--enable-llvm-static-stdccp` to take a libstdc++ on Jessie into account # which is too old and if used gives undefined reference errors # # `--release-channel=stable` to just include stable features in the @@ -63,9 +63,7 @@ targets: # `--set=` to explicitly specify the C compiler. We need to compile the # bundled LLVM and it wants to use `cc`. However, we don't have that in # our compiled GCC resulting in weird errors due to C and C++ compiler - # version mismatch. We avoid that with this configure option. We need to - # build our own GCC in the first place as 4.7.2 is too old to get all the - # Rust pieces compiled. + # version mismatch. We avoid that with this configure option. configure_opt: --enable-local-rust --enable-vendor --enable-extended --enable-llvm-static-stdcpp --release-channel=stable --sysconfdir=etc --target=x86_64-unknown-linux-gnu,i686-unknown-linux-gnu --set=target.x86_64-unknown-linux-gnu.cc=gcc --set=target.i686-unknown-linux-gnu.cc=gcc osx-x86_64: diff --git a/projects/firefox/config b/projects/firefox/config index 79674fb..fe5081e 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -54,15 +54,6 @@ targets: var: branding_directory: 'browser/branding/nightly' - linux: - var: - post_pkginst: | - # Firefox ESR68 needs Yasm >= 1.2.0 which Debian Wheezy ships in backports. - echo 'deb http://archive.debian.org/debian/ wheezy-backports main' >> /etc/apt/sources.list - export DEBIAN_FRONTEND=noninteractive - apt-get update - apt-get install -t wheezy-backports -y yasm - linux-x86_64: var: martools_filename: mar-tools-linux64.zip diff --git a/projects/rust/config b/projects/rust/config index 4144b17..4d4cd51 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -56,7 +56,7 @@ targets: # # `--enable-extended` to build not only rustc but cargo as well # - # `--enable-llvm-static-stdccp` to take a libstdc++ on Wheezy into account + # `--enable-llvm-static-stdcpp` to take a libstdc++ on Jessie into account # which is too old and if used gives undefined reference errors # # `--release-channel=stable` to just include stable features in the @@ -73,9 +73,7 @@ targets: # `--set=` to explicitly specify the C compiler. We need to compile the # bundled LLVM and it wants to use `cc`. However, we don't have that in # our compiled GCC resulting in weird errors due to C and C++ compiler - # version mismatch. We avoid that with this configure option. We need to - # build our own GCC in the first place as 4.7.2 is too old to get all the - # Rust pieces compiled. + # version mismatch. We avoid that with this configure option. configure_opt: --enable-local-rust --enable-vendor --enable-extended --enable-llvm-static-stdcpp --release-channel=stable --sysconfdir=etc --target=x86_64-unknown-linux-gnu,i686-unknown-linux-gnu --set=target.x86_64-unknown-linux-gnu.cc=gcc --set=target.i686-unknown-linux-gnu.cc=gcc osx-x86_64: diff --git a/rbm.conf b/rbm.conf index a68c101..ecd404f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -326,7 +326,7 @@ targets: # Only build Namecoin for linux on nightly namecoin: '[% c("var/nightly") %]' container: - suite: wheezy + suite: jessie arch: amd64 pre_pkginst: dpkg --add-architecture i386 deps:

1 0

[tor-browser-build/master] Merge branch 'bug_26238_v6' into master
by gk＠torproject.org 18 Sep '20

18 Sep '20

commit 41cfbfdaa3ea840d6eae7ea7d998942ee6f56c52 Merge: 1d426e5 6c9cf92 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 18 20:19:37 2020 +0000 Merge branch 'bug_26238_v6' into master README.BUILD_ERRORS | 26 -------------------------- projects/binutils/build | 5 ----- projects/clang/build | 1 - projects/container-image/config | 4 ++-- projects/debootstrap-image/config | 27 +++++++++++++-------------- projects/fenix-clang/build | 1 - projects/fenix-rust/config | 6 ++---- projects/firefox/config | 9 --------- projects/rust/config | 6 ++---- rbm.conf | 2 +- 10 files changed, 20 insertions(+), 67 deletions(-)

1 0

[tor-browser/tor-browser-78.3.0esr-10.5-1] Revert "Bug 21907: Fix runtime error on CentOS 6"
by gk＠torproject.org 18 Sep '20

18 Sep '20

commit 090676aed458ed15a441e41350065f09f2df4566 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 17 08:46:57 2020 +0000 Revert "Bug 21907: Fix runtime error on CentOS 6" This reverts commit a00c57b6116329b5376bbf3f4212e5d2a3fece07. The 10.0 series is the last one with CentOS 6 support. --- gfx/harfbuzz/src/hb-glib.cc | 53 +++++++++++++++++++++++++++++++++++++++++++++ gfx/harfbuzz/src/hb-glib.h | 5 +++++ 2 files changed, 58 insertions(+) diff --git a/gfx/harfbuzz/src/hb-glib.cc b/gfx/harfbuzz/src/hb-glib.cc index 2fd39610203d..058f65ae69c3 100644 --- a/gfx/harfbuzz/src/hb-glib.cc +++ b/gfx/harfbuzz/src/hb-glib.cc @@ -49,6 +49,7 @@ **/ +#if !GLIB_CHECK_VERSION(2,29,14) static const hb_script_t glib_script_to_script[] = { @@ -170,6 +171,7 @@ glib_script_to_script[] = HB_SCRIPT_SORA_SOMPENG, HB_SCRIPT_TAKRI }; +#endif /** * hb_glib_script_to_script: @@ -185,6 +187,9 @@ glib_script_to_script[] = hb_script_t hb_glib_script_to_script (GUnicodeScript script) { +#if GLIB_CHECK_VERSION(2,29,14) + return (hb_script_t) g_unicode_script_to_iso15924 (script); +#else if (likely ((unsigned int) script < ARRAY_LENGTH (glib_script_to_script))) return glib_script_to_script[script]; @@ -192,6 +197,7 @@ hb_glib_script_to_script (GUnicodeScript script) return HB_SCRIPT_INVALID; return HB_SCRIPT_UNKNOWN; +#endif } /** @@ -208,6 +214,9 @@ hb_glib_script_to_script (GUnicodeScript script) GUnicodeScript hb_glib_script_from_script (hb_script_t script) { +#if GLIB_CHECK_VERSION(2,29,14) + return g_unicode_script_from_iso15924 (script); +#else unsigned int count = ARRAY_LENGTH (glib_script_to_script); for (unsigned int i = 0; i < count; i++) if (glib_script_to_script[i] == script) @@ -217,6 +226,7 @@ hb_glib_script_from_script (hb_script_t script) return G_UNICODE_SCRIPT_INVALID_CODE; return G_UNICODE_SCRIPT_UNKNOWN; +#endif } @@ -263,6 +273,10 @@ hb_glib_unicode_compose (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_codepoint_t *ab, void *user_data HB_UNUSED) { +#if GLIB_CHECK_VERSION(2,29,12) + return g_unichar_compose (a, b, ab); +#endif + /* We don't ifdef-out the fallback code such that compiler always * sees it and makes sure it's compilable. */ @@ -296,6 +310,10 @@ hb_glib_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_codepoint_t *b, void *user_data HB_UNUSED) { +#if GLIB_CHECK_VERSION(2,29,12) + return g_unichar_decompose (ab, a, b); +#endif + /* We don't ifdef-out the fallback code such that compiler always * sees it and makes sure it's compilable. */ @@ -397,4 +415,39 @@ hb_glib_get_unicode_funcs () return static_glib_funcs.get_unconst (); } + + +#if GLIB_CHECK_VERSION(2,31,10) + +static void +_hb_g_bytes_unref (void *data) +{ + g_bytes_unref ((GBytes *) data); +} + +/** + * hb_glib_blob_create: + * @gbytes: the GBytes structure to work upon + * + * Creates an #hb_blob_t blob from the specified + * GBytes data structure. + * + * Return value: (transfer full): the new #hb_blob_t blob object + * + * Since: 0.9.38 + **/ +hb_blob_t * +hb_glib_blob_create (GBytes *gbytes) +{ + gsize size = 0; + gconstpointer data = g_bytes_get_data (gbytes, &size); + return hb_blob_create ((const char *) data, + size, + HB_MEMORY_MODE_READONLY, + g_bytes_ref (gbytes), + _hb_g_bytes_unref); +} +#endif + + #endif diff --git a/gfx/harfbuzz/src/hb-glib.h b/gfx/harfbuzz/src/hb-glib.h index 4adbd7c332cb..5f04183ba19f 100644 --- a/gfx/harfbuzz/src/hb-glib.h +++ b/gfx/harfbuzz/src/hb-glib.h @@ -46,6 +46,11 @@ hb_glib_script_from_script (hb_script_t script); HB_EXTERN hb_unicode_funcs_t * hb_glib_get_unicode_funcs (void); +#if GLIB_CHECK_VERSION(2,31,10) +HB_EXTERN hb_blob_t * +hb_glib_blob_create (GBytes *gbytes); +#endif + HB_END_DECLS #endif /* HB_GLIB_H */

1 0

[tor-browser-build/master] Bug 40041: Remove CentOS 6 support for 10.5 series
by gk＠torproject.org 18 Sep '20

18 Sep '20

commit 1d426e5c975804f91095b9be0b9ea71d75e91ac0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 18 06:32:26 2020 +0000 Bug 40041: Remove CentOS 6 support for 10.5 series CentOS 6 will be EOL later this year (Nov 2020). We are removing support for it beginning with 10.5 which will get released around mid-2021. --- projects/firefox/start-firefox | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/projects/firefox/start-firefox b/projects/firefox/start-firefox index 7e7685c..67788a0 100644 --- a/projects/firefox/start-firefox +++ b/projects/firefox/start-firefox @@ -11,30 +11,6 @@ add_LD_LIBRARY_PATH() { fi } -# Bug 27552: On CentOS/RHEL 6, we need to add the firefox bundled dir -# to LD_LIBRARY_PATH -if test -f /etc/system-release-cpe -then - if test "$(cut -d : -f 3 /etc/system-release-cpe)" = centos || \ - test "$(cut -d : -f 3 /etc/system-release-cpe)" = "enterprise_linux" - then - if test "$(cut -d : -f 5 /etc/system-release-cpe)" = "6" - then - if test -d /usr/lib64/firefox/bundled/lib64 - then - add_LD_LIBRARY_PATH /usr/lib64/firefox/bundled/lib64 - elif test -d /usr/lib/firefox/bundled/lib - then - add_LD_LIBRARY_PATH /usr/lib/firefox/bundled/lib - else - echo "Error: the firefox package (version 60 or more) is not installed." >&2 - echo "On CentOS/RHEL 6, Tor Browser requires the firefox package to be installed." >&2 - exit 1 - fi - fi - fi -fi - # Check if the system has a more recent version of libstdc++.so.6; if yes, use # that instead of the bundled version. "$basedir/abicheck" >/dev/null 2>&1

1 0

[tor-browser-build/maint-10.0] Update makefile release target and tag build2
by sysrqb＠torproject.org 17 Sep '20

17 Sep '20

commit c5431b7c2fff0e98580ebfe795e12bcef9ab0370 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Sep 17 18:32:33 2020 +0000 Update makefile release target and tag build2 --- Makefile | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7e2e104..15c8674 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ rbm=./rbm/rbm all: release release: submodule-update - $(rbm) build release --target release --target torbrowser-all + $(rbm) build release --target release --target torbrowser-all-desktop release-android: submodule-update $(rbm) build release --target release --target torbrowser-all-android diff --git a/rbm.conf b/rbm.conf index bd1c8a2..ac24f8f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '10.0' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.5.4 project_name: tor-browser

1 0

[tor-launcher/master] Release preparations for 0.2.25
by sysrqb＠torproject.org 17 Sep '20

17 Sep '20

commit 8c49d63c60aa7dc17cb45c61def9d1ef2600ad10 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Sep 17 18:17:53 2020 +0000 Release preparations for 0.2.25 Translations update and version bump --- src/chrome/locale/ga-IE/network-settings.dtd | 28 +++++++++--------- src/chrome/locale/ga-IE/torlauncher.properties | 2 +- src/chrome/locale/it/network-settings.dtd | 10 +++---- src/chrome/locale/sq/network-settings.dtd | 28 +++++++++--------- src/chrome/locale/sq/torlauncher.properties | 40 +++++++++++++------------- src/install.rdf | 2 +- 6 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/chrome/locale/ga-IE/network-settings.dtd b/src/chrome/locale/ga-IE/network-settings.dtd index e8ff8f3..1bb82b0 100644 --- a/src/chrome/locale/ga-IE/network-settings.dtd +++ b/src/chrome/locale/ga-IE/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Roghnach"> <!ENTITY torsettings.useProxy.checkbox "Úsáidim seachfhreastalaí chun ceangal leis an Idirlíon"> -<!ENTITY torsettings.useProxy.type "Proxy Type"> +<!ENTITY torsettings.useProxy.type "Cineál Seachfhreastalaí"> <!ENTITY torsettings.useProxy.type.placeholder "roghnaigh cineál an tseachfhreastalaí"> -<!ENTITY torsettings.useProxy.address "Address"> +<!ENTITY torsettings.useProxy.address "Seoladh"> <!ENTITY torsettings.useProxy.address.placeholder "Seoladh IP nó óstainm"> <!ENTITY torsettings.useProxy.port "Port"> -<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.username "Ainm Úsáideora"> <!ENTITY torsettings.useProxy.password "Focal faire"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Téann an ríomhaire seo trí bhalla dóiteáin nach gceadaíonn ceangail ach le poirt áirithe"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "Poirt a Cheadaítear"> <!ENTITY torsettings.useBridges.checkbox "Déantar cinsireacht ar Tor sa tír seo"> <!ENTITY torsettings.useBridges.default "Roghnaigh droichead ionsuite"> <!ENTITY torsettings.useBridges.default.placeholder "roghnaigh droichead"> @@ -63,21 +63,21 @@  <!ENTITY torPreferences.categoryTitle "Tor"> -<!ENTITY torPreferences.torSettings "Tor Settings"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > +<!ENTITY torPreferences.torSettings "Socruithe Tor"> +<!ENTITY torPreferences.torSettingsDescription "Seolann Brabhsálaí Tor do chuid tráchta thar líonra Tor, líonra faoi stiúir na mílte oibrí deonach timpeall an domhain." > <!ENTITY torPreferences.learnMore "Tuilleadh Eolais"> <!ENTITY torPreferences.bridges "Droichid"> <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.useBridge "Use a bridge"> +<!ENTITY torPreferences.useBridge "Úsáid droichead"> <!ENTITY torPreferences.requestNewBridge "Iarr Droichead Nua..."> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> -<!ENTITY torPreferences.advanced "Advanced"> +<!ENTITY torPreferences.provideBridge "Soláthair droichead"> +<!ENTITY torPreferences.advanced "Ardroghanna"> <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> -<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> +<!ENTITY torPreferences.requestBridgeDialogTitle "Iarr Droichead"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Ag dul i dteagmháil le BridgeDB. Fan nóiméad."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Réitigh an CAPTCHA le droichead a iarraidh."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "Níl an freagra sin ceart. Bain triail eile as."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.viewTorLogs "Féach ar logchomhaid Tor."> +<!ENTITY torPreferences.viewLogs "Féach ar na Logchomhaid..."> +<!ENTITY torPreferences.torLogsDialogTitle "Logchomhaid Tor"> diff --git a/src/chrome/locale/ga-IE/torlauncher.properties b/src/chrome/locale/ga-IE/torlauncher.properties index 8b11073..0cf1437 100644 --- a/src/chrome/locale/ga-IE/torlauncher.properties +++ b/src/chrome/locale/ga-IE/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=Níorbh fhéidir Tor a thosú.\n\n%S torlauncher.tor_missing=Tá an clár inrite Tor ar iarraidh. torlauncher.torrc_missing=Tá an comhad torrc ar iarraidh agus níorbh fhéidir é a chruthú. torlauncher.datadir_missing=Níl comhadlann sonraí Tor ann agus níorbh fhéidir é a chruthú. -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=Níl comhadlann fíordheimhnithe onion Tor ann, agus níorbh fhéidir í a chruthú torlauncher.password_hash_missing=Níl aon fháil ar an bhfocal faire haiseáilte. torlauncher.failed_to_get_settings=Ní féidir socruithe Tor a fháil.\n\n%S diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index 503cbb0..67d5aff 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -1,6 +1,6 @@ -<!ENTITY torsettings.dialog.title "Impostazioni rete Tor"> +<!ENTITY torsettings.dialog.title "Impostazioni della Rete Tor"> <!ENTITY torsettings.wizard.title.default "Connetti a Tor"> -<!ENTITY torsettings.wizard.title.configure "Impostazioni della rete Tor"> +<!ENTITY torsettings.wizard.title.configure "Impostazioni della Rete Tor"> <!ENTITY torsettings.wizard.title.connecting "Connessione in corso">  @@ -69,15 +69,15 @@ <!ENTITY torPreferences.bridges "Bridges"> <!ENTITY torPreferences.bridgesDescription "I bridge ti aiutano ad accedere alla rete Tor in luoghi dove Tor viene bloccato. A seconda di dove ti trovi, un bridge può funzionare meglio di un altro."> <!ENTITY torPreferences.useBridge "Usa un bridge"> -<!ENTITY torPreferences.requestNewBridge "Richiedi un nuovo bridge..."> +<!ENTITY torPreferences.requestNewBridge "Richiedi un Nuovo Bridge..."> <!ENTITY torPreferences.provideBridge "Fornisci un bridge"> <!ENTITY torPreferences.advanced "Avanzate"> <!ENTITY torPreferences.advancedDescription "Configura come Tor Browser si connette a internet."> <!ENTITY torPreferences.firewallPortsPlaceholder "Valori separati da una virgola"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Richiedi bridge"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Richiedi Bridge"> <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contattando BridgeDB. Attendere, prego."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Risolvi il CAPTCHA per richiedere un bridge."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "La soluzione è sbagliata. Riprova."> <!ENTITY torPreferences.viewTorLogs "Visualizza i log di Tor."> -<!ENTITY torPreferences.viewLogs "Visualizza log..."> +<!ENTITY torPreferences.viewLogs "Visualizza Log..."> <!ENTITY torPreferences.torLogsDialogTitle "Log di Tor"> diff --git a/src/chrome/locale/sq/network-settings.dtd b/src/chrome/locale/sq/network-settings.dtd index 1250a78..d40c31e 100644 --- a/src/chrome/locale/sq/network-settings.dtd +++ b/src/chrome/locale/sq/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Konfigurimi i Rrjetit të Tor"> +<!ENTITY torsettings.dialog.title "Rregullime Rrjeti Tor"> <!ENTITY torsettings.wizard.title.default "Connect to Tor"> <!ENTITY torsettings.wizard.title.configure "Konfigurimi i Rrjetit të Tor"> <!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> @@ -11,34 +11,34 @@ <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> <!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> -<!ENTITY torSettings.configure "Konfiguroni"> -<!ENTITY torSettings.connect "Lidhuni"> +<!ENTITY torSettings.configure "Formësojeni"> +<!ENTITY torSettings.connect "Lidhu">  -<!ENTITY torsettings.startingTor "Duke pritur që Tor të nisë..."> +<!ENTITY torsettings.startingTor "Po pritet që të niset Tor-i…"> <!ENTITY torsettings.restartTor "Riniseni Tor-in"> <!ENTITY torsettings.reconfigTor "Rikonfiguroni"> <!ENTITY torsettings.discardSettings.prompt "Ju keni konfiguruar urat Tor ose keni futur konfigurimin e proxy-t.  Për të bërë një lidhje të drejtpërdrejtë tek rrjeti Tor, ky konfigurim duhet të hiqet."> <!ENTITY torsettings.discardSettings.proceed "Hiqeni Konfigurimin dhe Lidhuni"> -<!ENTITY torsettings.optional "Me zgjedhje"> +<!ENTITY torsettings.optional "Opsional"> -<!ENTITY torsettings.useProxy.checkbox "Unë përdor një proxy për tu lidhur në Internet"> +<!ENTITY torsettings.useProxy.checkbox "Për t’u lidhur në Internet, unë përdor një ndërmjetës"> <!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adresë"> -<!ENTITY torsettings.useProxy.address.placeholder "Adresa IP ose emri i pritësit"> +<!ENTITY torsettings.useProxy.address.placeholder "Adresë IP ose emër strehë"> <!ENTITY torsettings.useProxy.port "Portë"> <!ENTITY torsettings.useProxy.username "Emër përdoruesi"> <!ENTITY torsettings.useProxy.password "Fjalëkalim"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "Ky kompjuter kalon përmes një muri mbrojtës, që i lejon lidhje vetëm me disa porta."> -<!ENTITY torsettings.firewall.allowedPorts "Portat e Lejuara"> -<!ENTITY torsettings.useBridges.checkbox "TOR është i çensuruar në vëndin tim"> +<!ENTITY torsettings.firewall.checkbox "Ky kompjuter kalon përmes një firewall-i, i cili lejon lidhje vetëm me disa porta."> +<!ENTITY torsettings.firewall.allowedPorts "Porta të Lejuara"> +<!ENTITY torsettings.useBridges.checkbox "TOR censurohet në vendin tim"> <!ENTITY torsettings.useBridges.default "Zgjidh një urë të paracaktuar"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> <!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> @@ -46,15 +46,15 @@ <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> <!ENTITY torsettings.useBridges.captchaSubmit "Parashtroni"> <!ENTITY torsettings.useBridges.custom "Mundëso një urë lidhëse që njoh"> -<!ENTITY torsettings.useBridges.label "Vendos informacion për urën nga një burim i besuar."> -<!ENTITY torsettings.useBridges.placeholder "shkruaj adresën:portën (një për rresht)"> +<!ENTITY torsettings.useBridges.label "Jepni të dhëna ure prej një burimi të besuar."> +<!ENTITY torsettings.useBridges.placeholder "shtypni adresë:portë (një për rresht)"> -<!ENTITY torsettings.copyLog "Kopjojeni Regjistrin e Tor në Kujtesën e fragmenteve"> +<!ENTITY torsettings.copyLog "Kopjo Regjistër Tor në Të papastër"> <!ENTITY torsettings.proxyHelpTitle "Proxy Help"> <!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> -<!ENTITY torsettings.bridgeHelpTitle "Ndihma mbi Relenë e Urë"> +<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> <!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> diff --git a/src/chrome/locale/sq/torlauncher.properties b/src/chrome/locale/sq/torlauncher.properties index 613f20d..091148a 100644 --- a/src/chrome/locale/sq/torlauncher.properties +++ b/src/chrome/locale/sq/torlauncher.properties @@ -1,30 +1,30 @@ ### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Lëshuesi Tor +torlauncher.error_title=Nisës Tor-i torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. -torlauncher.tor_exited=Tor doli papritmas. Kjo mund të jetë për shkak të një gabimi të vetë Tor, të një tjetër programi në sistemin tuaj, ose të të metave të diskut të ngurtë. Derisa ta rinisni Tor, Tor Browser nuk do mund të arrijë asnjë webfaqe. Nëse problemi vijon, ju lutemi dërgoni një kopje të Regjistrit tuaj të Tor, tek ekipi i mbështetjes. +torlauncher.tor_exited=Tor-i reshti së funksionuari papritmas. Kjo mund të jetë për shkak të një të mete të vetë Tor-it, të një tjetër programi në sistemin tuaj, ose defekti në hardware. Derisa ta rinisni Tor-in, Shfletuesi Tor s’do të jetë në gjendje të hapë ndonjë sajt. Nëse problemi vijon, ju lutemi, dërgojini ekipit të asistencës një kopje të Regjistrit të Tor-it tuaj. torlauncher.tor_exited2=Rinisja e Tor s'do t'i mbyllë skedat e shfletuesit tuaj. -torlauncher.tor_controlconn_failed=E pamundur lidhja me portin e kontrollit të Tor. -torlauncher.tor_failed_to_start=Tor dështoi të nisë. +torlauncher.tor_controlconn_failed=S’u lidh dot me portë kontrolli Tor. +torlauncher.tor_failed_to_start=Tor-i s’arriti të niset. torlauncher.tor_control_failed=Dështim në marrjen në kontroll të Tor. -torlauncher.tor_bootstrap_failed=Tor dështoi që të vendoste një lidhje me rrjetin e Tor. +torlauncher.tor_bootstrap_failed=Tor-i s’arriti të vendosë lidhje me një rrjet Tor. torlauncher.tor_bootstrap_failed_details=%1$S dështoi (%2$S). -torlauncher.unable_to_start_tor=E pamundur që të niset Tor.\n\n%S -torlauncher.tor_missing=Skedari i ekzekutueshëm Tor, mungon. -torlauncher.torrc_missing=Skedari torrc mungon dhe s'mund të krijohet. -torlauncher.datadir_missing=Të dhënat e direktorisë Tor data nuk ekzistojnë dhe s'mund të krijohen. +torlauncher.unable_to_start_tor=S’arrihet të niset Tor-i.\n\n%S +torlauncher.tor_missing=Mungon kartela e ekzekutueshme Tor +torlauncher.torrc_missing=Mungon kartela torrc dhe s’mund të krijohet. +torlauncher.datadir_missing=Drejtoria e të dhënave Tor s’ekziston dhe s’mund të krijohet. torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. -torlauncher.password_hash_missing=Dështuam të përftonim fjalëkalimin me thurje. +torlauncher.password_hash_missing=S’u arrit të merrej fjalëkalim me hash. -torlauncher.failed_to_get_settings=Dështuam të gjenim konfigurimin e Tor.\n\n%S -torlauncher.failed_to_save_settings=Dështuam të ruanim konfigurimin e Tor.\n\n%S -torlauncher.ensure_tor_is_running=Ju lutemi sigurohuni që Tor është në ekzekutim. +torlauncher.failed_to_get_settings=S’arrihet të merren rregullime për Tor-in.\n\n%S +torlauncher.failed_to_save_settings=S’arrihet të ruhen rregullime për Tor-in.\n\n%S +torlauncher.ensure_tor_is_running=Ju lutemi, sigurohuni që Tor-i po xhiron. -torlauncher.error_proxy_addr_missing=Ju duhet të përcaktoni një adresë IP ose emër pritësi, si edhe një numër porte, për të konfiguruar Tor në mënyrë që të përdorë një proxy për t'u qasur në Internet. -torlauncher.error_proxy_type_missing=Duhet të përzgjidhni tipin proxy. +torlauncher.error_proxy_addr_missing=Për ta formësuar Tor-in të përdorë një ndërmjetës për hyrje në Internet, duhet të përcaktoni një adresë IP ose emërstrehë, si edhe një numër porte. +torlauncher.error_proxy_type_missing=Duhet të përzgjidhni llojin e ndërmjetësit. torlauncher.error_bridges_missing=Duhet të specifikoni një ose më shumë ura. torlauncher.error_default_bridges_type_missing=Duhet të përzgjidhni një lloj transport për urat e parashikuara torlauncher.error_bridgedb_bridges_missing=Please request a bridge. @@ -42,13 +42,13 @@ torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. torlauncher.no_bridges_available=No bridges are available at this time. Sorry. -torlauncher.connect=Lidhuni +torlauncher.connect=Lidhu torlauncher.restart_tor=Riniseni Tor -torlauncher.quit=Ndërpriteni -torlauncher.quit_win=Dilni -torlauncher.done=Kryer +torlauncher.quit=Mbylle +torlauncher.quit_win=Dil +torlauncher.done=U bë -torlauncher.forAssistance=Për ndihmë, kontaktoni %S +torlauncher.forAssistance=Për asistencë, lidhuni me %S torlauncher.forAssistance2=Për ndihmë, vizitoni %S torlauncher.copiedNLogMessages=Kopjimi u krye. Mesazhet e regjistrit të Tor për %S, janë gati për t'u ngjitur në një redaktues teksti, ose në një mesazh e-poste. diff --git a/src/install.rdf b/src/install.rdf index 772db91..444654d 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.24</em:version> + <em:version>0.2.25</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-browser-build/master] Move desktop nightlies to 10.5 series
by gk＠torproject.org 16 Sep '20

16 Sep '20

commit 0df5964adb5cc43cd504b71b9fac24f0ab20b8b8 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 17 08:27:55 2020 +0000 Move desktop nightlies to 10.5 series --- projects/firefox/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index b0a58fb..79674fb 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,9 +8,9 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 78.2.0 + firefox_platform_version: 78.3.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' - torbrowser_branch: 10.0 + torbrowser_branch: 10.5 branding_directory: 'browser/branding/alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps:

1 0

[tor-browser/tor-browser-81.0b9-10.0-1] fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by gk＠torproject.org 16 Sep '20

16 Sep '20

commit 7f647b0fc5312b64e5b78291691bb0f6c156dc5d Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Sep 16 19:52:45 2020 +0200 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances addons.json is not used anymore with v3 blocklisting enabled, so we don't add it while we are at it. Closes tor-browser#40128. --- services/settings/dumps/blocklists/moz.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/services/settings/dumps/blocklists/moz.build b/services/settings/dumps/blocklists/moz.build index 3ba9ba4980a8..dd0bad30f19a 100644 --- a/services/settings/dumps/blocklists/moz.build +++ b/services/settings/dumps/blocklists/moz.build @@ -8,9 +8,14 @@ with Files('**'): BUG_COMPONENT = ('Toolkit', 'Blocklist Implementation') # The addons blocklist is also in mobile/android/installer/package-manifest.in -FINAL_TARGET_FILES.defaults.settings.blocklists += ['addons.json', +FINAL_TARGET_FILES.defaults.settings.blocklists += ['addons-bloomfilters.json', 'gfx.json', 'plugins.json'] +FINAL_TARGET_FILES.defaults.settings.blocklists['addons-bloomfilters'] += [ + 'addons-bloomfilters/addons-mlbf.bin', + 'addons-bloomfilters/addons-mlbf.bin.meta.json' +] + if CONFIG['MOZ_BUILD_APP'] == 'browser': DIST_SUBDIR = 'browser'

1 0