- tbb-commits - lists.torproject.org

[tor-browser-build/master] Merge remote-tracking branch 'phw/project/31164'
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit e5922c8fc4c518112f2b32f57319306770071c3e Merge: 4739eb7 12e86d1 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 25 06:17:28 2019 +0000 Merge remote-tracking branch 'phw/project/31164' projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor-browser-build/master] Add three new default obfs4 bridges.
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit 12e86d1fbb3e024a04f93cb370b265f5f81fc56e Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Sep 23 08:35:20 2019 -0700 Add three new default obfs4 bridges. These bridges are run by Karlstad University in Sweden. See the following ticket for more details: <https://bugs.torproject.org/31164> --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index de9f98b..aa464d6 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -12,6 +12,9 @@ pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 85.31.186.98:443 01 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.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/master] Update OpenSSL to 1.1.1d
by gk＠torproject.org 23 Sep '19

23 Sep '19

commit 4739eb773e74edf1f0df7d7ed9ac79b6a0ddf92c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 23 19:02:50 2019 +0000 Update OpenSSL to 1.1.1d --- projects/openssl/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index 1a3da33..27b9526 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.1.1c +version: 1.1.1d filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -26,4 +26,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90 + sha256sum: 1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2

1 0

[tor-browser-build/master] Bug 31584: Clean up mingw-w64 project
by boklm＠torproject.org 23 Sep '19

23 Sep '19

commit 67a38dec8014e4ba33dc062527e74df2aca1f3db Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 16 06:41:49 2019 +0000 Bug 31584: Clean up mingw-w64 project We bump the GCC version to a supported one (9.2.0). The obvious choice would have been 8.3.0 as we use for our Linux bundles. But, alas, that one is crashing when cross-compiling Rust for 64bit Windows. --- projects/mingw-w64/build | 11 ++---- projects/mingw-w64/config | 5 ++- projects/mingw-w64/libtool-sort.patch | 67 ----------------------------------- projects/tor/build | 3 ++ 4 files changed, 7 insertions(+), 79 deletions(-) diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 4be660d..111205c 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -22,17 +22,10 @@ cd /var/tmp/build mkdir gcc cd gcc tar xJf $rootdir/gcc-[% c("var/gcc_version") %].tar.xz -# https://gcc.gnu.org/ml/gcc-patches/2018-06/msg01115.html -# From gcc commit 494c17dc2bf45b8155fb9a14178ab48f01bc12a8 -# libtool: Sort output of 'find' to enable deterministic builds. -patch -p1 -d gcc-[% c("var/gcc_version") %] < $rootdir/libtool-sort.patch -# We don't want to link against msvcrt.dll due to bug 9084 and want to use -# pthreads, too, as this is needed for ESR60, at least due to bug 1406542. -[% c("arch") %]-w64-mingw32-g++ -dumpspecs > $distdir/msvcr100.spec -sed 's/msvcrt/msvcr100 -lpthread/' -i $distdir/msvcr100.spec # LDFLAGS_FOR_TARGET does not work for some reason. Thus, we take # CFLAGS_FOR_TARGET. -export CFLAGS_FOR_TARGET="-specs=$distdir/msvcr100.spec -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-insert-timestamp" +export CFLAGS_FOR_TARGET="-Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-insert-timestamp" +# Rust requires enabling pthreads gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=[% c("arch") %]-w64-mingw32 --with-gnu-ld --with-gnu-as --disable-multilib --enable-threads=posix --enable-languages=c,c++ make -j[% c("buildconf/num_procs") %] all-gcc make install-gcc diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index b088c8e..1ccbcdf 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -6,7 +6,7 @@ version: '[% c("abbrev") %]' var: container: use_container: 1 - gcc_version: 6.4.0 + gcc_version: 9.2.0 deps: - automake - build-essential @@ -30,7 +30,6 @@ targets: input_files: - project: container-image - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("var/gcc_version") %]/gcc-[% c("var/gcc_version") %].tar.xz' - sha256sum: 850bf21eafdfe5cd5f6827148184c08c4a0852a37ccf36ce69855334d2c914d4 + sha256sum: ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 - name: binutils project: binutils - - filename: libtool-sort.patch diff --git a/projects/mingw-w64/libtool-sort.patch b/projects/mingw-w64/libtool-sort.patch deleted file mode 100644 index 7c7fa85..0000000 --- a/projects/mingw-w64/libtool-sort.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 494c17dc2bf45b8155fb9a14178ab48f01bc12a8 Mon Sep 17 00:00:00 2001 -From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4> -Date: Thu, 5 Jul 2018 19:13:45 +0000 -Subject: [PATCH 1/1] * libtool.m4: Sort output of 'find' to enable - deterministic builds. * ltmain.sh: Likewise. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@262451 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - ChangeLog | 5 +++++ - libtool.m4 | 8 ++++---- - ltmain.sh | 4 ++-- - 3 files changed, 11 insertions(+), 6 deletions(-) - -diff --git a/libtool.m4 b/libtool.m4 -index 24d13f3..940faaa 100644 ---- a/libtool.m4 -+++ b/libtool.m4 -@@ -6005,20 +6005,20 @@ if test "$_lt_caught_CXX_error" != yes; then - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -diff --git a/ltmain.sh b/ltmain.sh -index 9503ec8..79f9ba8 100644 ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -2917,7 +2917,7 @@ func_extract_archives () - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do -- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` -+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` - $LIPO -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - $RM -rf unfat-$$ -@@ -2932,7 +2932,7 @@ func_extract_archives () - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac -- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" --- -2.9.3 - diff --git a/projects/tor/build b/projects/tor/build index 6b684a0..0705626 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -39,6 +39,9 @@ openssldir=/var/tmp/dist/openssl [% END %] tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %] zlibdir=/var/tmp/build/zlib + # XXX: It's a bit unfortunate but we need the pthread dll here as libevent + # gets compiled with pthread support once it is enabled in GCC, which we need + # to do as otherwise the Rust compilaton breaks. mingwlibs=/var/tmp/dist/mingw-w64/[% c("arch") %]-w64-mingw32/bin/ cp $zlibdir/lib/*.dll $openssldir/bin/*.dll $libeventdir/bin/*.dll \ $gcclibs/*.dll $mingwlibs/libwinpthread-1.dll $distdir/Tor/

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_31584_v4'
by boklm＠torproject.org 23 Sep '19

23 Sep '19

commit 17c61f4b647f0e0bf759d78ad49520770914524e Merge: b16662a 67a38de Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 23 19:24:47 2019 +0200 Merge remote-tracking branch 'gk/bug_31584_v4' projects/mingw-w64/build | 11 ++---- projects/mingw-w64/config | 5 ++- projects/mingw-w64/libtool-sort.patch | 67 ----------------------------------- projects/tor/build | 3 ++ 4 files changed, 7 insertions(+), 79 deletions(-)

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Revert "libssp test"
by gk＠torproject.org 23 Sep '19

23 Sep '19

commit 672bd49039cafa175f37b5bb3eaf850271e8a3a0 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 23 16:00:33 2019 +0000 Revert "libssp test" This reverts commit c153996e3cbc072eb2ae68ae5c532848b1ac9c3b. --- build/moz.configure/toolchain.configure | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 3bcf403bceec..68364075f006 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -1676,10 +1676,12 @@ def security_hardening_cflags(hardening_flag, asan, optimize, c_compiler, target # Enable only if hardening is not disabled and ASAN is # not on as ASAN will catch the crashes for us if compiler_is_gccish and not asan: - flags.append("-fstack-protector-strong") - ldflags.append("-fstack-protector-strong") - js_flags.append("-fstack-protector-strong") - js_ldflags.append("-fstack-protector-strong") + # mingw-clang cross-compile toolchain has bugs with stack protector + if target.os != 'WINNT' or c_compiler == 'gcc': + flags.append("-fstack-protector-strong") + ldflags.append("-fstack-protector-strong") + js_flags.append("-fstack-protector-strong") + js_ldflags.append("-fstack-protector-strong") # ASLR ------------------------------------------------ # ASLR (dynamicbase) is enabled by default in clang-cl; but the

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] libssp test
by gk＠torproject.org 23 Sep '19

23 Sep '19

commit c153996e3cbc072eb2ae68ae5c532848b1ac9c3b Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 23 09:38:13 2019 +0000 libssp test --- build/moz.configure/toolchain.configure | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 68364075f006..3bcf403bceec 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -1676,12 +1676,10 @@ def security_hardening_cflags(hardening_flag, asan, optimize, c_compiler, target # Enable only if hardening is not disabled and ASAN is # not on as ASAN will catch the crashes for us if compiler_is_gccish and not asan: - # mingw-clang cross-compile toolchain has bugs with stack protector - if target.os != 'WINNT' or c_compiler == 'gcc': - flags.append("-fstack-protector-strong") - ldflags.append("-fstack-protector-strong") - js_flags.append("-fstack-protector-strong") - js_ldflags.append("-fstack-protector-strong") + flags.append("-fstack-protector-strong") + ldflags.append("-fstack-protector-strong") + js_flags.append("-fstack-protector-strong") + js_ldflags.append("-fstack-protector-strong") # ASLR ------------------------------------------------ # ASLR (dynamicbase) is enabled by default in clang-cl; but the

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Pick up latest Torbutton changes
by gk＠torproject.org 23 Sep '19

23 Sep '19

commit 3c4e7292004b11e7f1dcd12dba6d3fd40edf0594 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 23 15:56:18 2019 +0000 Pick up latest Torbutton changes --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 903d676ccf33..2abe720e3f1d 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 903d676ccf33e36938438a595b71e781ef13bbe1 +Subproject commit 2abe720e3f1dbe1b49b41fe78719f318407babd0

1 0

[torbutton/master] Bug 30943: Show version number on mobile
by gk＠torproject.org 23 Sep '19

23 Sep '19

commit 2abe720e3f1dbe1b49b41fe78719f318407babd0 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Sep 18 20:45:14 2019 +0000 Bug 30943: Show version number on mobile --- chrome/skin/aboutTor.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css index baa92b42..555d1742 100644 --- a/chrome/skin/aboutTor.css +++ b/chrome/skin/aboutTor.css @@ -312,7 +312,7 @@ body:not([showmanual]) .showForManual { display: none; } -body[mobile] #torbrowser-info, +body[mobile] #torbrowser-changelog-link, body[mobile] .searchbox, body[mobile] .top .heading2, body[mobile] #manual,

1 0

[tor-launcher/master] Bug 31491: clean up the old meek http helper browser profiles
by gk＠torproject.org 22 Sep '19

22 Sep '19

commit d78a233bc597c8df63e794f880a1a7f54fb9cebd Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Sep 19 16:01:42 2019 -0400 Bug 31491: clean up the old meek http helper browser profiles On macOS, remove the old meek and moat http helper browser profiles that may be present under TorBrowser-Data/Tor/PluggableTransports/. Removal is only attempted once; this is controlled by the Boolean pref extensions.torlauncher.should_remove_meek_helper_profiles. --- src/components/tl-process.js | 2 ++ src/defaults/preferences/torlauncher-prefs.js | 7 ++++++ src/modules/tl-util.jsm | 36 +++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 3aa45e4..49abc0a 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -112,6 +112,8 @@ TorProcessService.prototype = Cr.NS_ERROR_NOT_INITIALIZED); } + TorLauncherUtil.removeMeekAndMoatHelperProfiles(); + if (TorLauncherUtil.shouldOnlyConfigureTor) { this._controlTor(true, false); diff --git a/src/defaults/preferences/torlauncher-prefs.js b/src/defaults/preferences/torlauncher-prefs.js index cc6b1a7..55fe38c 100644 --- a/src/defaults/preferences/torlauncher-prefs.js +++ b/src/defaults/preferences/torlauncher-prefs.js @@ -5,6 +5,13 @@ pref("extensions.torlauncher.prompt_for_locale", true); pref("extensions.torlauncher.start_tor", true); pref("extensions.torlauncher.prompt_at_startup", true); +// This pref controls whether Tor Launcher will try to remove the old +// meek and moat http helper browser profiles. This only has an effect +// on macOS; for Windows and Linux profile removal is handled by the +// updater (since on those platforms the profiles are embedded within +// the browser install directory). +pref("extensions.torlauncher.should_remove_meek_helper_profiles", true); + pref("extensions.torlauncher.loglevel", 4); // 1=verbose, 2=debug, 3=info, 4=note, 5=warn pref("extensions.torlauncher.logmethod", 1); // 0=stdout, 1=errorconsole, 2=debuglog pref("extensions.torlauncher.max_tor_log_entries", 1000); diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 14ac76f..c54acb9 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -758,6 +758,42 @@ let TorLauncherUtil = // Public } } catch(e) {} }, + + removeMeekAndMoatHelperProfiles: function() + { + function removeDirectory(aParentDir, aName) + { + try + { + let dir = aParentDir.clone(); + dir.appendRelativePath(aName); + if (dir.exists()) + dir.remove(true); + } + catch (e) + { + TorLauncherLogger.log(5, "Failed to remove " + aName + ": " + e); + } + } + + const kPrefRemoveHelperProfiles = + "extensions.torlauncher.should_remove_meek_helper_profiles"; + if (this.getBoolPref(kPrefRemoveHelperProfiles, false)) + { + // Only attempt removal once. + this.setBoolPref(kPrefRemoveHelperProfiles, false); + + if (this.isMac) + { + let ptProfilesDir = this.getTorFile("pt-profiles-dir", true); + if (ptProfilesDir) + { + removeDirectory(ptProfilesDir, "profile.meek-http-helper"); + removeDirectory(ptProfilesDir, "profile.moat-http-helper"); + } + } + } + }, };

1 0