- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 22884: about:tor page is not showing up
by boklm＠torproject.org 20 Jul '17

20 Jul '17

commit c8adacae7f34fa569b09eb1b1fb1930fb638d6a8 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jul 19 10:05:48 2017 -0400 Bug 22884: about:tor page is not showing up Whitelist about:tor so that NoScript does not block its JavaScript. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index a34fb36..164835a 100644 --- a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index a34fb36..164835a 100644 --- a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index a34fb36..164835a 100644 --- a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false);

1 0

[tor-browser-bundle/master] Fixup: we don't install binutils for macOS (bug 22831)
by gk＠torproject.org 20 Jul '17

20 Jul '17

commit 135c3c89fcc2d2a523d0473a2ac5107bb47bd904 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 20 08:46:58 2017 +0000 Fixup: we don't install binutils for macOS (bug 22831) Found by boklm. --- gitian/descriptors/mac/gitian-webrtc.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/gitian/descriptors/mac/gitian-webrtc.yml b/gitian/descriptors/mac/gitian-webrtc.yml index c5f0509..4df2819 100644 --- a/gitian/descriptors/mac/gitian-webrtc.yml +++ b/gitian/descriptors/mac/gitian-webrtc.yml @@ -97,7 +97,6 @@ script: | GN_ARGS+=" is_clang=false use_sysroot=false" GN_ARGS+=" clang_use_chrome_plugins=false" GN_ARGS+=" clang_base_path=\"$HOME/build/clang\"" - GN_ARGS+=" gold_path=\"$INSTDIR/binutils/bin\"" # Avoid some dependencies. GN_ARGS+=" rtc_include_opus=false rtc_include_ilbc=false rtc_include_internal_audio_device=false" # Tests are needed for field_trial, metrics_default, and pc_test_utils targets

1 0

[tor-browser-build/master] Build webrtc for mac.
by boklm＠torproject.org 19 Jul '17

19 Jul '17

commit de79b7e079b44d9b50504413027b632f28fed255 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 19 18:27:01 2017 +0200 Build webrtc for mac. tor-browser-bundle.git author: David Fifield <david(a)bamsoftware.com> tor-browser-bundle.git commit: fcdc2be0a2da32a939e172564300d5a09259b75e --- projects/webrtc/build | 99 ++++++++++--- projects/webrtc/config | 11 ++ projects/webrtc/webrtc-mac.patch | 305 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 397 insertions(+), 18 deletions(-) diff --git a/projects/webrtc/build b/projects/webrtc/build index 4905644..43b8261 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -1,4 +1,5 @@ #!/bin/bash +set -e [% c("var/set_default_env") -%] [% c("var/setarch") -%] distdir=/var/tmp/dist/[% project %] @@ -10,6 +11,15 @@ mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] +[% IF c("var/osx") -%] + # src/build/toolchain/mac/filter_libtool.py wants libtool to be called exactly "libtool". + ln -sf x86_64-apple-darwin10-libtool $cctoolsdir/libtool + export AR=x86_64-apple-darwin10-ar + # Certain cross-compiling flags are set in webrtc-mac.patch because the build + # system doesn't honor CFLAGS etc. environment variables. +[% ELSE -%] + AR=ar +[% END -%] # Setting up depot_tools # https://dev.chromium.org/developers/how-tos/install-depot-tools @@ -24,15 +34,48 @@ tar -C /var/tmp/build -xf webrtc-sources-[% c('version') %].tar.gz builddir=/var/tmp/build/[% project %]/src cd $builddir -patch -p1 < $rootdir/webrtc-linux.patch +[% IF c("var/linux") -%] + patch -p1 < $rootdir/webrtc-linux.patch +[% END -%] +[% IF c("var/osx") -%] + patch -p1 < $rootdir/webrtc-mac.patch +[% END -%] + +[% IF c("var/linux") -%] + # First, build a copy of GN, rather than use the prebuilt copy in buildtools/linux64. + cd tools/gn + # __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. + CXXFLAGS=-D__STDC_FORMAT_MACROS=1 LDFLAGS=-latomic ./bootstrap/bootstrap.py --no-rebuild --no-clean + cd ../.. + # This is where bootstrap.py stashes the built gn. + GN="$PWD/out_bootstrap/gn" +[% END -%] +[% IF c("var/osx") -%] + # The linux descriptor builds its own copy of gn, using tools/gn/bootstrap/bootstrap.py. + # I tried that here, but for some reason the gn so built doesn't work. On "gn gen", + # it crashes with this error: + # [0624/022439.767916:FATAL:command_gen.cc(59)] Check failed: !rule.empty(). + # Instead, use the gn packaged with depot_tools. + GN="/var/tmp/dist/depot_tools/gn" + + # Hardcode the output of some utility programs that otherwise require Xcode + # tools, like xcode-select, xcodebuild, sw_vers, and xcrun. This probably + # needs to be kept in sync with the SDK version. + cat <<EOF > build/mac/find_sdk.py +print("$sysrootdir") +print("10.7") +EOF + cat <<EOF > build/config/mac/sdk_info.py +print("machine_os_build=\"10.7\"") +print("sdk_build=\"10.7\"") +print("sdk_path=\"$sysrootdir\"") +print("sdk_platform_path=\"$sysrootdir\"") +print("sdk_version=\"10.7\"") +print("xcode_build=\"7.3\"") +print("xcode_version=\"0730\"") +EOF +[% END -%] -# First, build a copy of GN, rather than use the prebuilt copy in buildtools/linux64. -cd tools/gn -# __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. -CXXFLAGS=-D__STDC_FORMAT_MACROS=1 LDFLAGS=-latomic ./bootstrap/bootstrap.py --no-rebuild --no-clean -cd ../.. -# This is where bootstrap.py stashes the built gn. -GN="$PWD/out_bootstrap/gn" [% IF c("var/linux") -%] export CC=gcc @@ -50,7 +93,6 @@ GN="$PWD/out_bootstrap/gn" export GN_ARGS="" # For a list of all possible GN args, do "gn gen out/Release; gn args --list out/Release". # https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/cross… -GN_ARGS+=" target_os=\"linux\" target_cpu=\"[% IF c("var/linux-i686") %]x86[% ELSE %]x64[% END %]\"" # Not debug. GN_ARGS+=" is_debug=false" # There are warnings from unused returns. @@ -59,23 +101,44 @@ GN_ARGS+=" treat_warnings_as_errors=false" GN_ARGS+=" is_component_build=false" # Do not use bundled utilities. GN_ARGS+=" is_clang=false use_sysroot=false" -GN_ARGS+=" gold_path=\"$INSTDIR/binutils/bin\"" -# Make extra sure we don't use bundled binutils. -rm -rf third_party/binutils/Linux_* -# Avoid some dependencies. -GN_ARGS+=" use_ozone=true use_gconf=false" -GN_ARGS+=" rtc_include_opus=false rtc_include_ilbc=false rtc_include_internal_audio_device=false rtc_include_pulse_audio=false" -# Included for "field_trial" below. Maybe "fieldtrial_testing_like_official_build" could help here? -#GN_ARGS+=" rtc_include_tests=false" +[% IF c("var/linux") -%] + GN_ARGS+=" target_os=\"linux\" target_cpu=\"[% IF c("var/linux-i686") %]x86[% ELSE %]x64[% END %]\"" + GN_ARGS+=" gold_path=\"$INSTDIR/binutils/bin\"" + # Make extra sure we don't use bundled binutils. + rm -rf third_party/binutils/Linux_* + # Avoid some dependencies. + GN_ARGS+=" use_ozone=true use_gconf=false" + GN_ARGS+=" rtc_include_opus=false rtc_include_ilbc=false rtc_include_internal_audio_device=false rtc_include_pulse_audio=false" + # Included for "field_trial" below. Maybe "fieldtrial_testing_like_official_build" could help here? + #GN_ARGS+=" rtc_include_tests=false" +[% END -%] +[% IF c("var/osx") -%] + GN_ARGS+=" target_os=\"mac\" target_cpu=\"x64\" mac_deployment_target=\"10.7\"" + GN_ARGS+=" clang_use_chrome_plugins=false" + GN_ARGS+=" clang_base_path=\"$clangdir\"" + # Avoid some dependencies. + GN_ARGS+=" rtc_include_opus=false rtc_include_ilbc=false rtc_include_internal_audio_device=false" + # Tests are needed for field_trial, metrics_default, and pc_test_utils targets + # (which include code needed by go-webrtc). + GN_ARGS+=" rtc_include_tests=true" + # Make sure not to use bundled clang and binutils. + rm -rf third_party/llvm-build + rm -rf third_party/binutils +[% END -%] rm -rf out/Release "$GN" gen out/Release --args="$GN_ARGS" ninja -C out/Release webrtc field_trial metrics_default pc_test_utils +# The cctools ar doesn't have the 'D' deterministic option of GNU ar, but the +# ZERO_AR_DATE environment variable similarly sets timestamps within the +# archive to zero. +# https://opensource.apple.com/source/cctools/cctools-886/ar/archive.c.auto.h… +# https://codereview.chromium.org/699083004/ # .o files under out/Release/obj/ are the build outputs. Don't include .o # files from elsewhere under out/ because they are build helpers and things # like that, not necessarily of the target architecture, and anyway are not # needed. # https://bugs.torproject.org/22832 -ar crs libwebrtc-magic.a $(find out/Release/obj -name '*.o' | sort) +[% IF c("var/osx") %]ZERO_AR_DATE=1 [% END %]"$AR" crs libwebrtc-magic.a $(find out/Release/obj -name '*.o' | sort) mkdir -p $distdir cd $distdir diff --git a/projects/webrtc/config b/projects/webrtc/config index dff6ecc..da60d2d 100644 --- a/projects/webrtc/config +++ b/projects/webrtc/config @@ -20,6 +20,8 @@ input_files: enable: '[% c("var/linux") %]' - filename: webrtc-linux.patch enable: '[% c("var/linux") %]' + - filename: webrtc-mac.patch + enable: '[% c("var/osx") %]' targets: linux: @@ -44,6 +46,15 @@ targets: var: webrtc: lib_path: lib/libwebrtc-linux-amd64-magic.a + osx-x86_64: + var: + webrtc: + lib_path: lib/libwebrtc-darwin-amd64-magic.a + arch_deps: + - libglib2.0-dev + - libgtk2.0-dev + - pkg-config + - python-biplist steps: fetch_sources: diff --git a/projects/webrtc/webrtc-mac.patch b/projects/webrtc/webrtc-mac.patch new file mode 100644 index 0000000..5c9cedd --- /dev/null +++ b/projects/webrtc/webrtc-mac.patch @@ -0,0 +1,305 @@ +From bd27c327f72ea231353983aa35a0c3e6ae8055d5 Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Mon, 26 Jun 2017 11:26:55 -0700 +Subject: [PATCH 1/8] Disable assertions that prevent cross-compiling for mac. + +--- + config/BUILDCONFIG.gn | 4 ++-- + toolchain/mac/BUILD.gn | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn +index d055e705..78a2023a 100644 +--- a/build/config/BUILDCONFIG.gn ++++ b/build/config/BUILDCONFIG.gn +@@ -232,8 +232,8 @@ if (target_os == "android") { + } else if (target_os == "ios") { + _default_toolchain = "//build/toolchain/mac:ios_clang_$target_cpu" + } else if (target_os == "mac") { +- assert(host_os == "mac", "Mac cross-compiles are unsupported.") +- _default_toolchain = host_toolchain ++ # assert(host_os == "mac", "Mac cross-compiles are unsupported.") ++ _default_toolchain = "//build/toolchain/mac:clang_$host_cpu" + } else if (target_os == "win") { + # On Windows we use the same toolchain for host and target by default. + assert(target_os == host_os, "Win cross-compiles only work on win hosts.") +diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn +index b417e76a..5f48927d 100644 +--- a/build/toolchain/mac/BUILD.gn ++++ b/build/toolchain/mac/BUILD.gn +@@ -14,7 +14,7 @@ if (is_ios) { + import("//build/config/mac/mac_sdk.gni") + import("//build/config/mac/symbols.gni") + +-assert(host_os == "mac") ++# assert(host_os == "mac") + + import("//build/toolchain/cc_wrapper.gni") + import("//build/toolchain/clang_static_analyzer.gni") +-- +2.11.0 + +From a58bb43ea406939fcc978aa808714d04802074ac Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Mon, 26 Jun 2017 11:29:14 -0700 +Subject: [PATCH 2/8] Hardcode cross-compiling flags in config/mac/BUILD.gn. + +The build system doesn't provide a general way to set flags externally. +"No way to provide extra CFLAGS/CXXFLAGS/LDFLAGS" +https://bugs.chromium.org/p/chromium/issues/detail?id=595653 +--- + config/mac/BUILD.gn | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/build/config/mac/BUILD.gn b/build/config/mac/BUILD.gn +index 84180e6a..2054b46f 100644 +--- a/build/config/mac/BUILD.gn ++++ b/build/config/mac/BUILD.gn +@@ -83,6 +83,11 @@ config("runtime_library") { + "-isysroot", + sysroot, + "-mmacosx-version-min=$mac_deployment_target", ++ "-target", ++ "x86_64-apple-darwin10", ++ "-mlinker-version=136", ++ "-B", ++ "/var/tmp/dist/macosx-toolchain/cctools/bin", + ] + + asmflags = common_flags +-- +2.11.0 + +From 4c57d854280a0f0a4f55cba0457ae44f6369ca08 Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Mon, 26 Jun 2017 11:30:28 -0700 +Subject: [PATCH 3/8] Port build/config/mac/plist_util.py to biplist. + +So as not to require the plutil command. plutil was only being used to +convert between XML and binary plist formats, because versions of the +plistlib module before Python 3.4 only support the XML format. The +biplist library handles both formats natively. + +FAILED: gen/webrtc/examples/AppRTCMobile_info_plist_merged.plist +python ../../build/config/mac/plist_util.py merge -f=xml1 -o=gen/webrtc/examples/AppRTCMobile_info_plist_merged.plist ../../build/config/mac/BuildInfo.plist ../../webrtc/examples/objc/AppRTCMobile/mac/Info.plist +Traceback (most recent call last): + File "../../build/config/mac/plist_util.py", line 254, in <module> + sys.exit(Main()) + File "../../build/config/mac/plist_util.py", line 250, in Main + args.func(args) + File "../../build/config/mac/plist_util.py", line 207, in _Execute + data = MergePList(data, LoadPList(filename)) + File "../../build/config/mac/plist_util.py", line 121, in LoadPList + subprocess.check_call(['plutil', '-convert', 'xml1', '-o', name, path]) + File "/usr/lib/python2.7/subprocess.py", line 535, in check_call + retcode = call(*popenargs, **kwargs) + File "/usr/lib/python2.7/subprocess.py", line 522, in call + return Popen(*popenargs, **kwargs).wait() + File "/usr/lib/python2.7/subprocess.py", line 710, in __init__ + errread, errwrite) + File "/usr/lib/python2.7/subprocess.py", line 1335, in _execute_child + raise child_exception +OSError: [Errno 2] No such file or directory +--- + config/mac/plist_util.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/build/config/mac/plist_util.py b/build/config/mac/plist_util.py +index 0928fa13..898edc1a 100644 +--- a/build/config/mac/plist_util.py ++++ b/build/config/mac/plist_util.py +@@ -3,7 +3,7 @@ + # found in the LICENSE file. + + import argparse +-import plistlib ++import biplist + import os + import re + import subprocess +@@ -116,6 +116,7 @@ def Interpolate(plist, substitutions): + + def LoadPList(path): + """Loads Plist at |path| and returns it as a dictionary.""" ++ return biplist.readPlist(path) + fd, name = tempfile.mkstemp() + try: + subprocess.check_call(['plutil', '-convert', 'xml1', '-o', name, path]) +@@ -127,6 +128,7 @@ def LoadPList(path): + + def SavePList(path, format, data): + """Saves |data| as a Plist to |path| in the specified |format|.""" ++ return biplist.writePlist(data, path, {"xml1": False, "binary1": True}[format]) # doesn't handle "json" format + fd, name = tempfile.mkstemp() + try: + with os.fdopen(fd, 'w') as f: +-- +2.11.0 + +From d9577991412310d3313d9dcd86453ce24f845c2e Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Mon, 26 Jun 2017 11:37:34 -0700 +Subject: [PATCH 4/8] Hack workaround to disable dispatch_queue_get_label. + +dispatch_queue_get_label and DISPATCH_CURRENT_QUEUE_LABEL require SDK +10.9+. I don't know if removing this code even makes sense, but it at +least won't crash immediately because of a null pointer. + +https://developer.apple.com/documentation/dispatch/dispatch_current_queue_label +https://developer.apple.com/library/content/releasenotes/General/APIDiffsMacOSX10_9/General.html + +FAILED: obj/webrtc/base/rtc_task_queue/sequenced_task_checker_impl.o ../../../../clang/bin/clang++ -MMD -MF obj/webrtc/base/rtc_task_queue/sequenced_task_checker_impl.o.d -DV8_DEPRECATION_WARNINGS -DNO_TCMALLOC -DUSE_EXTERNAL_POPUP_MENU=1 -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DCHROMIUM_BUILD -DENABLE_MEDIA_ROUTER=1 -DFIELDTRIAL_TESTING_ENABLED -DCR_XCODE_VERSION=0730 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D_FORTIFY_SOURCE=2 -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DEXPAT_RELATIVE_PATH -DHAVE_SCTP -DWEBRTC_POSIX -DWEBRTC_MAC -I../.. -Igen -fno-strict-aliasing -fstack-protector -Wno-builtin-macro-redefined -D__DATE__= -D__TIME__= -D__TIMESTAMP__= -arch x86_64 -Wall -Wpartial-availability -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-unused-parameter -O2 -gdwarf-2 -isysroot /home/debian/build/MacOSX10.7.sdk -mmacosx-version-min=10.9 -targ et x86_64-apple-darwin10 -mlinker-version=136 -B /home/debian/build/cctools/bin -fvisibility=hidden -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-strict-overflow -fvisibility-inlines-hidden -std=c++11 -stdlib=libc++ -Wno-narrowing -fno-rtti -fno-exceptions -Wnon-virtual-dtor -Woverloaded-virtual -c ../../webrtc/base/sequenced_task_checker_impl.cc -o obj/webrtc/base/rtc_task_queue/sequenced_task_checker_impl.o +warning: unknown warning option '-Wno-maybe-uninitialized'; did you mean '-Wno-uninitialized'? [-Wunknown-warning-option] +../../webrtc/base/sequenced_task_checker_impl.cc:34:46: error: use of undeclared identifier 'DISPATCH_CURRENT_QUEUE_LABEL' + current_queue = dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL); + ^ +--- + webrtc/base/sequenced_task_checker_impl.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/webrtc/base/sequenced_task_checker_impl.cc b/webrtc/base/sequenced_task_checker_impl.cc +index f03e0b679..352b2162d 100644 +--- a/webrtc/base/sequenced_task_checker_impl.cc ++++ b/webrtc/base/sequenced_task_checker_impl.cc +@@ -30,8 +30,9 @@ bool SequencedTaskCheckerImpl::CalledSequentially() const { + #if defined(WEBRTC_MAC) + // If we're not running on a TaskQueue, use the system dispatch queue + // label as an identifier. +- if (current_queue == nullptr) +- current_queue = dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL); ++ // Disable this because dispatch_queue_get_label requires SDK 10.9+. ++ // if (current_queue == nullptr) ++ // current_queue = dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL); + #endif + CritScope scoped_lock(&lock_); + if (!attached_) { // true if previously detached. +-- +2.11.0 + + +From 62a6fa6376194ce673c220eef19fefeebe58fee1 Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Mon, 26 Jun 2017 11:41:16 -0700 +Subject: [PATCH 5/8] Include <sys/socket.h> in macifaddrs_converter.cc. + +Without this, when built against MacOSX10.7.sdk, there are errors: + +In file included from ../../webrtc/base/macifaddrs_converter.cc:13: +/home/debian/build/MacOSX10.7.sdk/usr/include/net/if.h:300:19: error: field has incomplete type 'struct sockaddr' + struct sockaddr ifru_addr; + +Related references: +https://trac.macports.org/ticket/49012 +https://trac.macports.org/browser/trunk/dports/gnome/gstreamer1/files/patch-struct-sockadr.diff?rev=140712 +--- + webrtc/base/macifaddrs_converter.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/webrtc/base/macifaddrs_converter.cc b/webrtc/base/macifaddrs_converter.cc +index 2ad070e8e..1995f1940 100644 +--- a/webrtc/base/macifaddrs_converter.cc ++++ b/webrtc/base/macifaddrs_converter.cc +@@ -10,6 +10,7 @@ + + #include <memory> + ++#include <sys/socket.h> + #include <net/if.h> + #include <sys/ioctl.h> + #include <unistd.h> +-- +2.11.0 + + +From e6a421534723408fb1292ce25051a1970f750a4a Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Mon, 26 Jun 2017 11:42:34 -0700 +Subject: [PATCH 6/8] Provide definitions of NS_ENUM and NS_OPTIONS. + +--- + webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h +index f9f15c37d..277676d85 100644 +--- a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h ++++ b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h +@@ -25,4 +25,17 @@ + #define RTC_FWD_DECL_OBJC_CLASS(classname) typedef struct objc_object classname + #endif + ++// http://iamthewalr.us/blog/2012/11/ns_enum-and-ns_options/ ++#if (__cplusplus && __cplusplus >= 201103L && (__has_extension(cxx_strong_enums) || __has_feature(objc_fixed_enum))) || (!__cplusplus && __has_feature(objc_fixed_enum)) ++#define NS_ENUM(_type, _name) enum _name : _type _name; enum _name : _type ++#if (__cplusplus) ++#define NS_OPTIONS(_type, _name) _type _name; enum : _type ++#else ++#define NS_OPTIONS(_type, _name) enum _name : _type _name; enum _name : _type ++#endif ++#else ++#define NS_ENUM(_type, _name) _type _name; enum ++#define NS_OPTIONS(_type, _name) _type _name; enum ++#endif ++ + #endif // WEBRTC_BASE_OBJC_RTC_MACROS_H_ +-- +2.11.0 + + +From baf5ddbd1e1281cd7c4cdda709e2ea7e07903727 Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Mon, 26 Jun 2017 11:43:05 -0700 +Subject: [PATCH 7/8] Replace firstObject with objectAtIndex:0. + +firstObject doesn't exist in our version of the SDK. + +The two method calls are not exactly the same; on an empty array, +firstObject returns nil while objectAtIndex:0 raises an exception. Let's +hope that doesn't matter. +--- + webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm b/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm +index 182056228..93bea08f9 100644 +--- a/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm ++++ b/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm +@@ -176,7 +176,7 @@ using namespace webrtc::videocapturemodule; + } + + - (AVCaptureVideoDataOutput*)currentOutput { +- return [[_captureSession outputs] firstObject]; ++ return [[_captureSession outputs] objectAtIndex:0]; + } + + - (void)startCaptureInBackgroundWithOutput: +-- +2.11.0 + + +From 0b5f86af5bc4b7697ee60adf7e1e057a023438e0 Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Mon, 26 Jun 2017 11:43:51 -0700 +Subject: [PATCH 8/8] Disable the desktop_capture module. + +It's causing an error related to CoreGraphics.h and hopefully we don't +need it. +--- + webrtc/modules/BUILD.gn | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/webrtc/modules/BUILD.gn b/webrtc/modules/BUILD.gn +index e750a8109..590f34275 100644 +--- a/webrtc/modules/BUILD.gn ++++ b/webrtc/modules/BUILD.gn +@@ -18,7 +18,6 @@ group("modules") { + "audio_processing", + "bitrate_controller", + "congestion_controller", +- "desktop_capture", + "media_file", + "pacing", + "remote_bitrate_estimator", +-- +2.11.0 +

1 0

[tor-browser-build/master] Bug 22831: Enable Snowflake for mac.
by boklm＠torproject.org 19 Jul '17

19 Jul '17

commit 1d38fb57874499b487e2ac26fa86b4a8bf427a8e Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jul 5 23:10:10 2017 -0700 Bug 22831: Enable Snowflake for mac. --- projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix index 271b36c..06dbec9 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -3,3 +3,6 @@ ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/ob ## meek configuration ClientTransportPlugin meek exec PluggableTransports/meek-client-torbrowser -- PluggableTransports/meek-client + +## snowflake configuration +ClientTransportPlugin snowflake exec PluggableTransports/snowflake-client -url https://snowflake-reg.appspot.com/ -front www.google.com -ice stun:stun.l.google.com:19302

1 0

[tor-browser-build/master] Set bridges prefs depending on platform
by boklm＠torproject.org 19 Jul '17

19 Jul '17

commit 551dd7a7b870177c5f6d391e73017f9dca5163b9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 19 18:49:17 2017 +0200 Set bridges prefs depending on platform --- projects/tor-browser/build | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 69469db..b9537a3 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -109,7 +109,17 @@ cp -a Bundle-Data/Docs/* $TBDIR/$DOCSPATH tar -C Bundle-Data/[% bundledata_osname %] -c . | tar -C $TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %] -x cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> $TBDIR/$TORCONFIGPATH/torrc-defaults -cat Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH +[% IF c("var/linux") -%] + cat Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH +[% END -%] +[% IF c("var/windows") -%] + # We don't have snowflake available on Windows yet + grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH +[% END -%] +[% IF c("var/osx") -%] + # FTE is temporarily removed due to bug 18495. + grep -Ev 'default_bridge\.fte' Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH +[% END -%] cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> $TBDIR/$MEEKPROFILEPATH/user.js [% IF c("var/osx") %]

1 0

[tor-browser-build/master] Build go-webrtc and snowflake for mac.
by boklm＠torproject.org 19 Jul '17

19 Jul '17

commit 9b59107420ab527696b08ac89d787abd2c67d985 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 19 18:33:12 2017 +0200 Build go-webrtc and snowflake for mac. tor-browser-bundle.git author: David Fifield <david(a)bamsoftware.com> tor-browser-bundle.git commit: 26e0cd44f2886bfad1c3d30844ff7a21eb9d0478 Commit message from the tor-browser-bundle.git commit: Build go-webrtc and snowflake in the mac pluggable-transports descriptor. I had to apply two tricks to get a reproducible snowflake-client. The first is to use faketime to eliminate some timestamps. There were 11 variable timestamps in the file. Through experimentation, I found that 10 of them were dependent on the Go runtime (recompiling Go caused them to change) and 1 was dependent on snowflake-client itself (recompiling snowflake-client with the same runtime changed only that 1 timestamp). The underlying issue has to do with clang 3.8.0 on Darwin embedding timestamps, unsolved in the Go issue tracker as of 13 days ago. https://github.com/golang/go/issues/9206#issuecomment-310476743 The second is a sed command to clobber embedded paths of the form /tmp/go-buildXXXXXXXXX and /tmp/go-link-XXXXXXXXX. Their presence is caused by some combination of Clang and Darwin, and there is as yet no known workaround upstream. --- projects/go-webrtc/config | 28 +++++++++++++++++++++------- projects/go/build | 7 ++++++- projects/go/config | 2 ++ projects/macosx-toolchain/build | 2 ++ projects/macosx-toolchain/config | 2 +- projects/snowflake/build | 36 +++++++++++++++++++++++++++++++++++- projects/snowflake/config | 4 ++++ rbm.conf | 5 ++++- 8 files changed, 75 insertions(+), 11 deletions(-) diff --git a/projects/go-webrtc/config b/projects/go-webrtc/config index 673215b..c97a959 100644 --- a/projects/go-webrtc/config +++ b/projects/go-webrtc/config @@ -20,13 +20,23 @@ var: # Replace the prebuilt webrtc library with our own one. rm -rf include/ lib/ cp -a /var/tmp/dist/webrtc/{include,lib} . - # The go-webrtc package sets _GLIBCXX_USE_CXX11_ABI=0 for compatibility with - # the prebuilt libwebrtc-magic.a libraries. Since we build our own - # libwebrtc-magic.a with the C++11 ABI, we have to undo that setting here, - # using CGO_CXXFLAGS. - # __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. - export CGO_CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=1 -D__STDC_FORMAT_MACROS=1" - export CGO_LDFLAGS=-latomic + [% IF c("var/linux") -%] + # The go-webrtc package sets _GLIBCXX_USE_CXX11_ABI=0 for compatibility with + # the prebuilt libwebrtc-magic.a libraries. Since we build our own + # libwebrtc-magic.a with the C++11 ABI, we have to undo that setting here, + # using CGO_CXXFLAGS. + # __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. + export CGO_CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=1 -D__STDC_FORMAT_MACROS=1" + export CGO_LDFLAGS=-latomic + [% END -%] + [% IF c("var/osx") -%] + export CGO_ENABLED=1 + export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.7" + export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" + export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" + export CC="$clangdir/bin/clang" + export CXX="$clangdir/bin/clang++" + [% END -%] targets: master: @@ -36,6 +46,10 @@ targets: arch_deps: - pkg-config - libx11-dev + osx-x86_64: + var: + arch_deps: + - pkg-config input_files: - project: container-image diff --git a/projects/go/build b/projects/go/build index 98f0522..3b51c32 100644 --- a/projects/go/build +++ b/projects/go/build @@ -52,7 +52,12 @@ cd /var/tmp/dist/go/src # http://golang.org/doc/install/source#environment export GOOS=darwin export GOARCH=amd64 - CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash + # faketime is needed because clang 3.8.0 on Darwin embeds the timestamps of + # certain intermediate object files (including those that arise here while + # compiling the Go runtime itself). Without this, variable timestamps would + # end up in snowflake-client. + # https://github.com/golang/go/issues/9206#issuecomment-310476743 + CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= [% c("var/faketime") %] ./make.bash [% ELSIF c("var/windows") -%] # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS. # Go's CC_FOR_TARGET only allows a command name, not a command with arguments. diff --git a/projects/go/config b/projects/go/config index 4b09e95..21669c9 100644 --- a/projects/go/config +++ b/projects/go/config @@ -60,6 +60,8 @@ targets: var: GOOS: darwin GOARCH: amd64 + arch_deps: + - faketime linux: var: GOOS: linux diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index e699e4f..f974cfc 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -10,6 +10,8 @@ tar -C $distdir -xf [% c('input_files_by_name/cctools') %] cd $distdir/cctools/bin ln -s ../../clang/bin/clang x86_64-apple-darwin10-clang ln -s ../../clang/bin/clang++ x86_64-apple-darwin10-clang++ +# "go link" expects to find a program called "dsymutil" exactly. +ln -sf x86_64-apple-darwin10-dsymutil dsymutil cd "/var/tmp/dist" [% c('tar', { diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index 1779eb8..bfdbdb6 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -6,7 +6,7 @@ var: use_container: 1 setup: | mkdir -p /var/tmp/dist - tar -C /var/tmp/dist -xf [% c("compiler_tarfile") %] + tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] export sysrootdir=/var/tmp/dist/[% project %]/SDK/ export clangdir=/var/tmp/dist/[% project %]/clang export cctoolsdir=/var/tmp/dist/[% project %]/cctools/bin diff --git a/projects/snowflake/build b/projects/snowflake/build index 6e08b4e..9d9c1fb 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -10,6 +10,12 @@ distdir=/var/tmp/dist/[% project %] [% IF c("var/osx") %] PTDIR="$distdir/Contents/MacOS/Tor/PluggableTransports" DOCSDIR="$distdir/Contents/Resources/TorBrowser/Docs/snowflake" + export CGO_ENABLED=1 + export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.7" + export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" + export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" + export CC="$clangdir/bin/clang" + export CXX="$clangdir/bin/clang++" [% ELSE %] PTDIR="$distdir/TorBrowser/Tor/PluggableTransports" DOCSDIR="$distdir/TorBrowser/Docs/snowflake" @@ -25,7 +31,35 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] cd client -go build -ldflags '-s' +[% IF c("var/osx") -%] + # Without faketime, snowflake-client would contain the timestamp of the + # temporary client.a file created during "go build". + [% c("var/faketime") %] go build -ldflags '-s' +[% ELSE -%] + go build -ldflags '-s' +[% END -%] +[% IF c("var/osx") -%] + # Hack: Overwrite variable absolute paths embedded in the binary. clang 3.8.0 + # on Darwin embeds such paths and the issue is unsolved in upstream Go as of + # 2016-06-28: + # https://github.com/golang/go/issues/9206#issuecomment-310476743 + # The two kinds of paths are ("000000000" stands for 9 random digits): + # /tmp/go-build000000000 + # /tmp/go-link-000000000 + # Such paths are the output of ioutil.TempDir("", "go-build") and + # ioutil.TempDir("", "go-link-"). + cp -a client client.stomped + sed -i -E -e 's#(/tmp/go-build|/tmp/go-link-)[0-9]{9}/#\1XXXXXXXXX/#g' client.stomped + # Sanity check: make sure the file actually changed. If it did not, it could + # mean that a change in go or clang has made this step unnecessary. + if cmp client client.stomped + then + echo "No paths replaced in snowflake-client. Maybe the replacement failed or is no longer needed." + echo "Check projects/snowflake/build" + exit 1 + fi + mv -f client.stomped client +[% END -%] cp -a client[% IF c("var/windows") %].exe[% END %] $PTDIR/snowflake-client[% IF c("var/windows") %].exe[% END %] cd .. diff --git a/projects/snowflake/config b/projects/snowflake/config index 89e3eb6..4bf438e 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -14,6 +14,10 @@ targets: arch_deps: - pkg-config - libx11-dev + osx-x86_64: + var: + arch_deps: + - faketime input_files: - project: container-image diff --git a/rbm.conf b/rbm.conf index c2143a9..49899ca 100644 --- a/rbm.conf +++ b/rbm.conf @@ -35,6 +35,7 @@ var: [% c("input_files_by_name/" _ file) %] [% END -%] + faketime: "faketime -f \"[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]\"" touch: "[% USE date %]touch -m -t [% date.format(c('timestamp'), format = '%Y%m%d%H%M') %]" locale_ja: ja @@ -130,7 +131,7 @@ targets: var: linux: 1 compiler: gcc - # We only build snowflake on linux for now + # We only build snowflake on linux and osx for now snowflake: 1 container: suite: wheezy @@ -190,6 +191,8 @@ targets: FLAGS: "-target x86_64-apple-darwin10 -mlinker-version=136 -B $cctoolsdir -isysroot $sysrootdir" LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie" locale_ja: ja-JP-mac + # We only build snowflake on linux and osx for now + snowflake: 1 deps: - build-essential - python

1 0

[tor-browser-bundle/master] Bug 22884: about:tor page is not showing up
by gk＠torproject.org 19 Jul '17

19 Jul '17

commit 355f03e18d7de4b9ca67d9e88ac6abce4c68d96b Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jul 19 10:05:48 2017 -0400 Bug 22884: about:tor page is not showing up Whitelist about:tor so that NoScript does not block its JavaScript. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index a34fb36..164835a 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index a34fb36..164835a 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index a34fb36..164835a 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false);

1 0

[tor-browser-build/master] Remove unused options
by boklm＠torproject.org 19 Jul '17

19 Jul '17

commit aade962f948345e3aeba1fc3750d202b21edea3e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 19 12:59:56 2017 +0200 Remove unused options --- projects/webrtc/config | 4 ---- 1 file changed, 4 deletions(-) diff --git a/projects/webrtc/config b/projects/webrtc/config index 6882e87..dff6ecc 100644 --- a/projects/webrtc/config +++ b/projects/webrtc/config @@ -39,14 +39,10 @@ targets: linux-i686: var: webrtc: - arch: ia32 - lib_arch: 386 lib_path: lib/libwebrtc-linux-386-magic.a linux-x86_64: var: webrtc: - arch: x64 - lib_arch: amd64 lib_path: lib/libwebrtc-linux-amd64-magic.a steps:

1 0

[tor-browser-build/master] Update ChangeLog
by boklm＠torproject.org 18 Jul '17

18 Jul '17

commit e24e89c06e2a78946c8d97580c71db2bf0281e5a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jul 18 09:34:40 2017 +0200 Update ChangeLog --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 157 +++++++++++++++++++++ 1 file changed, 157 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 94e967f..2e52d7c 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,15 @@ +Tor Browser 7.5a2 -- July 6 2017 + * All Platforms + * Update Tor to 0.3.1.4-alpha + * Update HTTPS-Everywhere to 5.2.19 + * Linux + * Update sandboxed-tor-browser to 0.0.9 + +Tor Browser 7.0.2 -- July 3 2017 + * All Platforms + * Update Tor to 0.3.0.9, fixing bug #22753 + * Update HTTPS-Everywhere to 5.2.19 + Tor Browser 7.5a1 -- June 14 2017 * All Platforms * Update Firefox to 52.2.0esr @@ -51,6 +63,151 @@ Tor Browser 7.5a1 -- June 14 2017 * Android * Bug 19078: Disable RtspMediaResource stuff in Orfox +Tor Browser 7.0.1 -- June 13 2017 + * All Platforms + * Update Firefox to 52.2.0esr + * Update Tor to 0.3.0.8 + * Update Torbutton to 1.9.7.4 + * Bug 22542: Security Settings window too small on macOS 10.12 + * Update HTTPS-Everywhere to 5.2.18 + * Bug 22362: NoScript's XSS filter freezes the browser + * OS X + * Bug 22558: Don't update OS X 10.7.x and 10.8.x users to Tor Browser 7.0 + +Tor Browser 7.0 -- June 7 2017 + * All Platforms + * Update Firefox to 52.1.2esr + * Update Tor to 0.3.0.7 + * Update Torbutton to 1.9.7.3 + * Bug 22104: Adjust our content policy whitelist for ff52-esr + * Bug 22457: Allow resources loaded by view-source:// + * Bug 21627: Ignore HTTP 304 responses when checking redirects + * Bug 22459: Adapt our use of the nsIContentPolicy to e10s mode + * Bug 21865: Update our JIT preferences in the security slider + * Bug 21747: Make 'New Tor Circuit for this Site' work in ESR52 + * Bug 21745: Fix handling of catch-all circuit + * Bug 21547: Fix circuit display under e10s + * Bug 21268: e10s compatibility for New Identity + * Bug 21267: Remove window resize implementation for now + * Bug 21201: Make Torbutton multiprocess compatible + * Translations update + * Update Tor Launcher to 0.2.12.2 + * Bug 22283: Linux 7.0a4 broken after update due to unix: lines in torrc + * Bug 20761: Don't ignore additional SocksPorts + * Bug 21920: Don't show locale selection dialog + * Bug 21546: Mark Tor Launcher as multiprocess compatible + * Bug 21264: Add a README file + * Translations update + * Update HTTPS-Everywhere to 5.2.17 + * Update NoScript to 5.0.5 + * Update Go to 1.8.3 (bug 22398) + * Bug 21962: Fix crash on about:addons page + * Bug 21766: Fix crash when the external application helper dialog is invoked + * Bug 21886: Download is stalled in non-e10s mode + * Bug 21778: Canvas prompt is not shown in Tor Browser based on ESR52 + * Bug 21569: Add first-party domain to Permissions key + * Bug 22165: Don't allow collection of local IP addresses + * Bug 13017: Work around audio fingerprinting by disabling the Web Audio API + * Bug 10286: Disable Touch API and add fingerprinting resistance as fallback + * Bug 13612: Disable Social API + * Bug 10283: Disable SpeechSynthesis API + * Bug 22333: Disable WebGL2 API for now + * Bug 21861: Disable additional mDNS code to avoid proxy bypasses + * Bug 21684: Don't expose navigator.AddonManager to content + * Bug 21431: Clean-up system extensions shipped in Firefox 52 + * Bug 22320: Use preference name 'referer.hideOnionSource' everywhere + * Bug 16285: Don't ship ClearKey EME system and update EME preferences + * Bug 21675: Spoof window.navigator.hardwareConcurrency + * Bug 21792: Suppress MediaError.message + * Bug 16337: Round times exposed by Animation API to nearest 100ms + * Bug 21972: about:support is partially broken + * Bug 21726: Keep Graphite support disabled + * Bug 21323: Enable Mixed Content Blocking + * Bug 21685: Disable remote new tab pages + * Bug 21790: Disable captive portal detection + * Bug 21686: Disable Microsoft Family Safety support + * Bug 22073: Make sure Mozilla's experiments are disabled + * Bug 21683: Disable newly added Safebrowsing capabilities + * Bug 22071: Disable Kinto-based blocklist update mechanism + * Bug 22415: Fix format error in our pipeline patch + * Bug 22072: Hide TLS error reporting checkbox + * Bug 20761: Don't ignore additional SocksPorts + * Bug 21862: Rip out potentially unsafe Rust code + * Bug 16485: Improve about:cache page + * Bug 22462: Backport of patch for bug 1329521 to fix assertion failure + * Bug 21340: Identify and backport new patches from Firefox + * Bug 22153: Fix broken feeds on higher security levels + * Bug 22025: Fix broken certificate error pages on higher security levels + * Bug 21887: Fix broken error pages on higher security levels + * Bug 22458: Fix broken `about:cache` page on higher security levels + * Bug 21876: Enable e10s by default on all supported platforms + * Bug 21876: Always use esr policies for e10s + * Bug 20905: Fix resizing issues after moving to a direct Firefox patch + * Bug 21875: Modal dialogs are maximized in ESR52 nightly builds + * Bug 21885: SVG is not disabled in Tor Browser based on ESR52 + * Bug 17334: Hide Referer when leaving a .onion domain (improved patch) + * Bug 18531: Uncaught exception when opening ip-check.info + * Bug 18574: Uncaught exception when clicking items in Library + * Bug 22327: Isolate Page Info media previews to first party domain + * Bug 22452: Isolate tab list menuitem favicons to first party domain + * Bug 15555: View-source requests are not isolated by first party domain + * Bug 3246: Double-key cookies + * Bug 8842: Fix XML parsing error + * Bug 5293: Neuter fingerprinting with Battery API + * Bug 16886: 16886: "Add-on compatibility check dialog" contains Firefox logo + * Bug 19645: TBB zooms text when resizing browser window + * Bug 19192: Untrust Blue Coat CA + * Bug 19955: Avoid confusing warning that favicon load request got cancelled + * Bug 20005: Backport fixes for memory leaks investigation + * Bug 20755: ltn.com.tw is broken in Tor Browser + * Bug 21896: Commenting on website is broken due to CAPTCHA not being displayed + * Bug 20680: Rebase Tor Browser patches to 52 ESR + * Bug 22429: Add IPv6 address for Lisbeth:443 obfs4 bridge + * Bug 22468: Add default obfs4 bridges frosty and dragon + * Windows + * Bug 22419: Prevent access to file:// + * Bug 12426: Make use of HeapEnableTerminationOnCorruption + * Bug 19316: Make sure our Windows updates can deal with the SSE2 requirement + * Bug 21868: Fix build bustage with FIREFOX_52_0_2esr_RELEASE for Windows + * OS X + * Bug 21940: Don't allow privilege escalation during update + * Bug 22044: Fix broken default search engine on macOS + * Bug 21879: Use our default bookmarks on OSX + * Bug 21779: Non-admin users can't access Tor Browser on macOS + * Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID + * Bug 21724: Make Firefox and Tor Browser distinct macOS apps + * Bug 21931: Backport OSX SetupMacCommandLine updater fixes + * Bug 15910: Don't download GMPs via the local fallback + * Linux + * Bug 16285: Remove ClearKey related library stripping + * Bug 22041: Fix update error during update to 7.0a3 + * Bug 22238: Fix use of hardened wrapper for Firefox build + * Bug 21907: Fix runtime error on CentOS 6 + * Bug 15910: Don't download GMPs via the local fallback + * Android + * Bug 19078: Disable RtspMediaResource stuff in Orfox + * Build system + * Windows + * Bug 21837: Fix reproducibility of accessibility code for Windows + * Bug 21240: Create patches to fix mingw-w64 compilation of Firefox ESR 52 + * Bug 21904: Bump mingw-w64 commit to help with sandbox compilation + * Bug 18831: Use own Yasm for Firefox cross-compilation + * OS X + * Bug 21328: Updating to clang 3.8.0 + * Bug 21754: Remove old GCC toolchain and macOS SDK + * Bug 19783: Remove unused macOS helper scripts + * Bug 10369: Don't use old GCC toolchain anymore for utils + * Bug 21753: Replace our old GCC toolchain in PT descriptor + * Bug 18530: ESR52 based Tor Browser only runs on macOS 10.9+ + * Bug 22328: Remove clang PIE wrappers + * Linux + * Bug 21930: NSS libraries are missing from mar-tools archive + * Bug 21239: Adapt Linux Firefox descriptor to ESR52 (use GTK2) + * Bug 21960: Linux bundles based on ESR 52 are not reproducible anymore + * Bug 21629: Fix broken ASan builds when switching to ESR 52 + * Bug 22444: Use hardening-wrapper when building GCC + * Bug 22361: Fix hardening of libraries built in linux/gitian-utils.yml + Tor Browser 7.0a4 -- May 15 2017 * All Platforms * Update Firefox to 52.1.1esr

1 0

[tor-browser-build/master] Bug 22829: Remove default obfs4 bridge riemann.
by boklm＠torproject.org 18 Jul '17

18 Jul '17

commit 7a2695a629df4e0ba454e542fbcbd719484c5122 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jul 5 18:34:23 2017 -0700 Bug 22829: Remove default obfs4 bridge riemann. --- .../Bundle-Data/PTConfigs/bridge_prefs.js | 47 +++++++++++----------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index d2f4236..2f68a1f 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -14,30 +14,29 @@ pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.162:8080 FC pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:15937 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:50002 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=2"); -pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.11:16488 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:12166 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.12:4304 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); -/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.23", "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.24", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 83.212.101.3:50002 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=2"); +pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 154.35.22.11:16488 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.9:12166 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.12:4304 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); +/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.21"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.22", "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.23", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0