summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2017-01-22 12:27:21 +0000
committerryoon <ryoon@pkgsrc.org>2017-01-22 12:27:21 +0000
commit827a072c417a13998c5edbf82bccbbe9d88133de (patch)
treed6e538198da93fe8ef41f2d703e6e81322da65e2 /security
parent1faa77178c68e3d61f23268f3541b4bdc3621773 (diff)
downloadpkgsrc-827a072c417a13998c5edbf82bccbbe9d88133de.tar.gz
Update to 6.0.8
* Use OpenBSD Ports distfile * Profile directory has changed to $HOME/TorBrowser-Data * Besed on Firefox 45.6.0
Diffstat (limited to 'security')
-rw-r--r--security/tor-browser/Makefile28
-rw-r--r--security/tor-browser/PLIST2431
-rw-r--r--security/tor-browser/distinfo160
-rw-r--r--security/tor-browser/patches/patch-aa133
-rw-r--r--security/tor-browser/patches/patch-accessible_atk_Platform.cpp98
-rw-r--r--security/tor-browser/patches/patch-al16
-rw-r--r--security/tor-browser/patches/patch-ao12
-rw-r--r--security/tor-browser/patches/patch-as16
-rw-r--r--security/tor-browser/patches/patch-b2g_installer_Makefile.in15
-rw-r--r--security/tor-browser/patches/patch-b2g_installer_package-manifest.in13
-rw-r--r--security/tor-browser/patches/patch-bf2
-rw-r--r--security/tor-browser/patches/patch-browser_app_nsBrowserApp.cpp36
-rw-r--r--security/tor-browser/patches/patch-browser_installer_package-manifest.in10
-rw-r--r--security/tor-browser/patches/patch-build_autoconf_compiler-opts.m42
-rw-r--r--security/tor-browser/patches/patch-build_autoconf_nss.m42
-rw-r--r--security/tor-browser/patches/patch-build_gyp.mozbuild2
-rw-r--r--security/tor-browser/patches/patch-build_pgo_profileserver.py2
-rw-r--r--security/tor-browser/patches/patch-config_Makefile.in2
-rw-r--r--security/tor-browser/patches/patch-config_baseconfig.mk10
-rw-r--r--security/tor-browser/patches/patch-config_external_moz.build22
-rw-r--r--security/tor-browser/patches/patch-config_rules.mk2
-rw-r--r--security/tor-browser/patches/patch-config_stl__wrappers_ios2
-rw-r--r--security/tor-browser/patches/patch-config_stl__wrappers_ostream2
-rw-r--r--security/tor-browser/patches/patch-config_system-headers62
-rw-r--r--security/tor-browser/patches/patch-config_system__wrappers_unwind.h9
-rw-r--r--security/tor-browser/patches/patch-dom_base_DOMRequest.cpp12
-rw-r--r--security/tor-browser/patches/patch-dom_base_moz.build2
-rw-r--r--security/tor-browser/patches/patch-dom_events_MessageEvent.h14
-rw-r--r--security/tor-browser/patches/patch-dom_media_AudioStream.h13
-rw-r--r--security/tor-browser/patches/patch-dom_media_gstreamer_GStreamerAllocator.cpp2
-rw-r--r--security/tor-browser/patches/patch-dom_media_moz.build2
-rw-r--r--security/tor-browser/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp2
-rw-r--r--security/tor-browser/patches/patch-dom_plugins_ipc_PluginModuleChild.h2
-rw-r--r--security/tor-browser/patches/patch-dom_plugins_ipc_PluginProcessChild.cpp2
-rw-r--r--security/tor-browser/patches/patch-dom_system_OSFileConstants.cpp33
-rw-r--r--security/tor-browser/patches/patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp (renamed from security/tor-browser/patches/patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp)10
-rw-r--r--security/tor-browser/patches/patch-gfx_cairo_libpixman_src_pixman-arm-neon-asm.S37
-rw-r--r--security/tor-browser/patches/patch-gfx_gl_GLContextProviderGLX.cpp16
-rw-r--r--security/tor-browser/patches/patch-gfx_graphite2_src_Bidi.cpp2
-rw-r--r--security/tor-browser/patches/patch-gfx_graphite2_src_moz.build15
-rw-r--r--security/tor-browser/patches/patch-gfx_moz.build2
-rw-r--r--security/tor-browser/patches/patch-gfx_skia_generate__mozbuild.py13
-rw-r--r--security/tor-browser/patches/patch-gfx_skia_moz.build13
-rw-r--r--security/tor-browser/patches/patch-gfx_skia_skia_src_core_SkUtilsArm.cpp45
-rw-r--r--security/tor-browser/patches/patch-gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp28
-rw-r--r--security/tor-browser/patches/patch-gfx_skia_skia_src_opts_memset.arm.S49
-rw-r--r--security/tor-browser/patches/patch-gfx_thebes_moz.build16
-rw-r--r--security/tor-browser/patches/patch-gfx_ycbcr_moz.build2
-rw-r--r--security/tor-browser/patches/patch-gfx_ycbcr_yuv__row__arm.S331
-rw-r--r--security/tor-browser/patches/patch-image_decoders_nsJPEGDecoder.cpp15
-rw-r--r--security/tor-browser/patches/patch-intl_hyphenation_glue_hnjalloc.h14
-rw-r--r--security/tor-browser/patches/patch-intl_hyphenation_hnjalloc.h14
-rw-r--r--security/tor-browser/patches/patch-intl_unicharutil_util_moz.build13
-rw-r--r--security/tor-browser/patches/patch-ipc_chromium_Makefile.in13
-rw-r--r--security/tor-browser/patches/patch-ipc_chromium_moz.build18
-rw-r--r--security/tor-browser/patches/patch-ipc_chromium_src_base_atomicops.h2
-rw-r--r--security/tor-browser/patches/patch-ipc_chromium_src_base_file__util.h14
-rw-r--r--security/tor-browser/patches/patch-ipc_chromium_src_base_file__util__posix.cc35
-rw-r--r--security/tor-browser/patches/patch-ipc_chromium_src_base_message__loop.cc2
-rw-r--r--security/tor-browser/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc22
-rw-r--r--security/tor-browser/patches/patch-ipc_chromium_src_base_platform__thread.h2
-rw-r--r--security/tor-browser/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc12
-rw-r--r--security/tor-browser/patches/patch-ipc_chromium_src_base_process__util.h2
-rw-r--r--security/tor-browser/patches/patch-ipc_chromium_src_base_process__util__bsd.cc13
-rw-r--r--security/tor-browser/patches/patch-ipc_chromium_src_base_process__util__posix.cc2
-rw-r--r--security/tor-browser/patches/patch-ipc_chromium_src_base_scoped__nsautorelease__pool.h2
-rw-r--r--security/tor-browser/patches/patch-ipc_chromium_src_base_sys__info__posix.cc16
-rw-r--r--security/tor-browser/patches/patch-ipc_chromium_src_base_time__posix.cc2
-rw-r--r--security/tor-browser/patches/patch-ipc_chromium_src_build_build__config.h2
-rw-r--r--security/tor-browser/patches/patch-ipc_chromium_src_chrome_common_transport__dib.h2
-rw-r--r--security/tor-browser/patches/patch-ipc_glue_GeckoChildProcessHost.cpp2
-rw-r--r--security/tor-browser/patches/patch-ipc_glue_ScopedXREEmbed.cpp16
-rw-r--r--security/tor-browser/patches/patch-ipc_glue_StringUtil.cpp2
-rw-r--r--security/tor-browser/patches/patch-ipc_glue_moz.build6
-rw-r--r--security/tor-browser/patches/patch-ipc_ipdl_ipdl_cxx_ast.py25
-rw-r--r--security/tor-browser/patches/patch-ipc_ipdl_ipdl_cxx_cgen.py27
-rw-r--r--security/tor-browser/patches/patch-ipc_ipdl_ipdl_lower.py17
-rw-r--r--security/tor-browser/patches/patch-js__src__vm__SPSProfiler.cpp2
-rw-r--r--security/tor-browser/patches/patch-js_public_CallArgs.h13
-rw-r--r--security/tor-browser/patches/patch-js_src_Makefile.in14
-rw-r--r--security/tor-browser/patches/patch-js_src_asmjs_AsmJSSignalHandlers.cpp22
-rw-r--r--security/tor-browser/patches/patch-js_src_ctypes_CTypes.h2
-rw-r--r--security/tor-browser/patches/patch-js_src_frontend_ParseMaps.cpp2
-rw-r--r--security/tor-browser/patches/patch-js_src_gc_Statistics.cpp15
-rw-r--r--security/tor-browser/patches/patch-js_src_jit-LIR.cpp10
-rw-r--r--security/tor-browser/patches/patch-js_src_jit_ExecutableAllocator.h16
-rw-r--r--security/tor-browser/patches/patch-js_src_jit_MIR.cpp10
-rw-r--r--security/tor-browser/patches/patch-js_src_jit_arm_Architecture-arm.cpp6
-rw-r--r--security/tor-browser/patches/patch-js_src_jsapi.cpp13
-rw-r--r--security/tor-browser/patches/patch-js_src_jsdate.cpp15
-rw-r--r--security/tor-browser/patches/patch-js_src_jskwgen.cpp2
-rw-r--r--security/tor-browser/patches/patch-js_src_jsmath.cpp2
-rw-r--r--security/tor-browser/patches/patch-js_src_shell_jsoptparse.cpp8
-rw-r--r--security/tor-browser/patches/patch-js_xpconnect_src_XPCConvert.cpp2
-rw-r--r--security/tor-browser/patches/patch-js_xpconnect_src_xpcprivate.h2
-rw-r--r--security/tor-browser/patches/patch-media_libcubeb_AUTHORS9
-rw-r--r--security/tor-browser/patches/patch-media_libcubeb_src_cubeb.c16
-rw-r--r--security/tor-browser/patches/patch-media_libcubeb_src_cubeb__alsa.c78
-rw-r--r--security/tor-browser/patches/patch-media_libcubeb_src_cubeb__oss.c2
-rw-r--r--security/tor-browser/patches/patch-media_libcubeb_src_moz.build19
-rw-r--r--security/tor-browser/patches/patch-media_libpng_pngpriv.h2
-rw-r--r--security/tor-browser/patches/patch-media_libsoundtouch_src_cpu__detect__x86.cpp2
-rw-r--r--security/tor-browser/patches/patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h12
-rw-r--r--security/tor-browser/patches/patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp2
-rw-r--r--security/tor-browser/patches/patch-media_libstagefright_system_core_liblog_fake__log__device.c2
-rw-r--r--security/tor-browser/patches/patch-media_libstagefright_system_core_liblog_logprint.c2
-rw-r--r--security/tor-browser/patches/patch-media_libtheora_lib_arm_armcpu.c2
-rw-r--r--security/tor-browser/patches/patch-media_libtheora_lib_info.c2
-rw-r--r--security/tor-browser/patches/patch-media_libtheora_moz.build14
-rw-r--r--security/tor-browser/patches/patch-media_libtremor_Makefile.in2
-rw-r--r--security/tor-browser/patches/patch-media_libtremor_moz.build2
-rw-r--r--security/tor-browser/patches/patch-media_libvorbis_Makefile.in2
-rw-r--r--security/tor-browser/patches/patch-media_libvorbis_lib_vorbis_info.c2
-rw-r--r--security/tor-browser/patches/patch-media_libvorbis_moz.build2
-rw-r--r--security/tor-browser/patches/patch-media_libyuv_include_libyuv_scale__row.h2
-rw-r--r--security/tor-browser/patches/patch-media_mtransport_third__party_nICEr_src_util_mbslen.c8
-rw-r--r--security/tor-browser/patches/patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h2
-rw-r--r--security/tor-browser/patches/patch-media_openmax__dl_dl_api_armCOMM__s.h37
-rw-r--r--security/tor-browser/patches/patch-media_webrtc_signaling_test_common.build (renamed from security/tor-browser/patches/patch-media_webrtc_signaling_test_moz.build)12
-rw-r--r--security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_build_common.gypi2
-rw-r--r--security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi27
-rw-r--r--security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_audio__coding_neteq_neteq.gypi2
-rw-r--r--security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.cc2
-rw-r--r--security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.h2
-rw-r--r--security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc2
-rw-r--r--security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc8
-rw-r--r--security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi31
-rw-r--r--security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp17
-rw-r--r--security/tor-browser/patches/patch-memory_build_mozjemalloc__compat.c8
-rw-r--r--security/tor-browser/patches/patch-memory_jemalloc_Makefile.in12
-rw-r--r--security/tor-browser/patches/patch-memory_jemalloc_src_configure13
-rw-r--r--security/tor-browser/patches/patch-memory_mozalloc_mozalloc__abort.cpp12
-rw-r--r--security/tor-browser/patches/patch-memory_volatile_VolatileBufferOSX.cpp2
-rw-r--r--security/tor-browser/patches/patch-mfbt_Alignment.h48
-rw-r--r--security/tor-browser/patches/patch-mfbt_Attributes.h22
-rw-r--r--security/tor-browser/patches/patch-mfbt_Poison.cpp2
-rw-r--r--security/tor-browser/patches/patch-mobile_android_installer_Makefile.in15
-rw-r--r--security/tor-browser/patches/patch-mobile_android_installer_package-manifest.in13
-rw-r--r--security/tor-browser/patches/patch-modules_libjar_nsZipArchive.cpp2
-rw-r--r--security/tor-browser/patches/patch-modules_libpref_init_all.js15
-rw-r--r--security/tor-browser/patches/patch-mozglue_build_arm.cpp57
-rw-r--r--security/tor-browser/patches/patch-mozglue_build_arm.h13
-rw-r--r--security/tor-browser/patches/patch-netwerk_base_nsNetUtil.h39
-rw-r--r--security/tor-browser/patches/patch-netwerk_dns_moz.build9
-rw-r--r--security/tor-browser/patches/patch-netwerk_protocol_http_Http2Session.cpp103
-rw-r--r--security/tor-browser/patches/patch-pb2
-rw-r--r--security/tor-browser/patches/patch-pc2
-rw-r--r--security/tor-browser/patches/patch-rc12
-rw-r--r--security/tor-browser/patches/patch-security_certverifier_OCSPRequestor.cpp12
-rw-r--r--security/tor-browser/patches/patch-security_manager_ssl_src_nsNSSCallbacks.cpp40
-rw-r--r--security/tor-browser/patches/patch-security_manager_ssl_src_nsNSSCallbacks.h26
-rw-r--r--security/tor-browser/patches/patch-security_manager_ssl_src_nsNSSComponent.cpp12
-rw-r--r--security/tor-browser/patches/patch-storage_SQLiteMutex.h (renamed from security/tor-browser/patches/patch-bg)8
-rw-r--r--security/tor-browser/patches/patch-toolkit_components_osfile_modules_osfile__unix__back.jsm49
-rw-r--r--security/tor-browser/patches/patch-toolkit_components_osfile_modules_osfile__unix__front.jsm13
-rw-r--r--security/tor-browser/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h20
-rw-r--r--security/tor-browser/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h13
-rw-r--r--security/tor-browser/patches/patch-toolkit_library_moz.build2
-rw-r--r--security/tor-browser/patches/patch-toolkit_xre_glxtest.cpp16
-rw-r--r--security/tor-browser/patches/patch-toolkit_xre_nsAppRunner.cpp2
-rw-r--r--security/tor-browser/patches/patch-toolkit_xre_nsEmbedFunctions.cpp2
-rw-r--r--security/tor-browser/patches/patch-toolkit_xre_nsXREDirProvider.cpp91
-rw-r--r--security/tor-browser/patches/patch-webapprt_moz.build2
-rw-r--r--security/tor-browser/patches/patch-widget_gtk_gtk2drawing.c22
-rw-r--r--security/tor-browser/patches/patch-widget_gtk_gtk3drawing.c833
-rw-r--r--security/tor-browser/patches/patch-widget_gtk_gtkdrawing.h41
-rw-r--r--security/tor-browser/patches/patch-widget_gtk_nsNativeThemeGTK.cpp30
-rw-r--r--security/tor-browser/patches/patch-xpcom_base_nsStackWalk.cpp59
-rw-r--r--security/tor-browser/patches/patch-xpcom_base_nscore.h2
-rw-r--r--security/tor-browser/patches/patch-xpcom_build_PoisonIOInterposer.h2
-rw-r--r--security/tor-browser/patches/patch-xpcom_build_XPCOMInit.cpp28
-rw-r--r--security/tor-browser/patches/patch-xpcom_components_Module.h8
-rw-r--r--security/tor-browser/patches/patch-xpcom_glue_standalone_nsXPCOMGlue.cpp17
-rw-r--r--security/tor-browser/patches/patch-xpcom_io_TorFileUtils.cpp23
-rw-r--r--security/tor-browser/patches/patch-xpcom_io_nsAppFileLocationProvider.cpp27
-rw-r--r--security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_Makefile.in24
-rw-r--r--security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build8
-rw-r--r--security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp2
-rw-r--r--security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S2
-rw-r--r--security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s2
-rw-r--r--security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp2
-rw-r--r--security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp2
-rw-r--r--security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp2
-rw-r--r--security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp2
-rw-r--r--security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp2
-rw-r--r--security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S2
-rw-r--r--security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s2
-rw-r--r--security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp2
-rw-r--r--security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp2
-rw-r--r--security/tor-browser/patches/patch-xulrunner_installer_Makefile.in2
190 files changed, 2381 insertions, 4026 deletions
diff --git a/security/tor-browser/Makefile b/security/tor-browser/Makefile
index bb588ad9238..4043ddf353b 100644
--- a/security/tor-browser/Makefile
+++ b/security/tor-browser/Makefile
@@ -1,19 +1,24 @@
-# $NetBSD: Makefile,v 1.13 2017/01/21 20:06:52 ryoon Exp $
+# $NetBSD: Makefile,v 1.14 2017/01/22 12:27:21 ryoon Exp $
-TORBVER= 5.5.4
+TORBVER= 6.0.8
-DISTNAME= tor-browser-38.7.1esr-5.5-1
+DISTNAME= v6.0.8-esr45.6.0
PKGNAME= tor-browser-${TORBVER}
-PKGREVISION= 7
CATEGORIES= www
-MASTER_SITES+= ${MASTER_SITE_LOCAL}
-EXTRACT_SUFX= .tar.xz
+# Use OpenBSD distfile
+MASTER_SITES= ${MASTER_SITE_OPENBSD:=distfiles/tor-browser/}
MAINTAINER= ryoon@NetBSD.org
HOMEPAGE= https://www.torproject.org/projects/torbrowser.html.en
COMMENT= Tor Browser based on Firefox
LICENSE= mpl-1.1
+# A name of OpenBSD Ports distfile does not have 'tor-browser' inside.
+DIST_SUBDIR= tor-browser
+
+EXTRACT_USING= bsdtar
+WRKSRC= ${WRKDIR}/${DISTNAME:S/v/torb-/}
+
DEPENDS+= tor-[0-9]*:../../net/tor
# Remove hardcoded build directory.
@@ -32,6 +37,9 @@ CONFIGURE_ARGS+= --disable-dbus
CONFIGURE_ARGS+= --disable-gnomeui
CONFIGURE_ARGS+= --disable-libnotify
CONFIGURE_ARGS+= --enable-pie
+CONFIGURE_ARGS+= --enable-tor-data-in-home-dir
+CFLAGS+= -DTOR_BROWSER_DATA_IN_HOME_DIR=1
+CFLAGS+= -DTOR_BROWSER_DATA_OUTSIDE_APP_DIR=1
# Avoid build failure from security/manager/ssl/src/nsNSSCallbacks.cpp:601
CFLAGS+= -fpermissive
@@ -53,7 +61,7 @@ LDFLAGS.DragonFly= -lplc4 -lnspr4
LDFLAGS.FreeBSD= -lplc4 -lnspr4
LDFLAGS.Linux= -lnspr4
-.include "../../www/firefox38/mozilla-common.mk"
+.include "../../www/firefox45/mozilla-common.mk"
.include "options.mk"
CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py
@@ -71,13 +79,13 @@ SUBST_MESSAGE.sys-dic= Reference to system hunspell dictionaries.
SUBST_FILES.sys-dic= extensions/spellcheck/hunspell/src/mozHunspell.cpp
SUBST_VARS.sys-dic= PREFIX
+post-extract:
+ mv ${WRKSRC}/gfx/ycbcr/yuv_row_arm.s ${WRKSRC}/gfx/ycbcr/yuv_row_arm.S
+
pre-configure:
cd ${WRKSRC} && mkdir ${OBJDIR}
cd ${WRKSRC} && autoconf
cd ${WRKSRC}/js/src && autoconf
-# XXX Makefile is broken? When libxul is provided from devel/xulrunner,
-# XXX please remove this.
- mkdir ${WRKSRC}/js/src/.deps
post-build:
${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \
diff --git a/security/tor-browser/PLIST b/security/tor-browser/PLIST
index 2d6317e11c7..a344b4fd3f0 100644
--- a/security/tor-browser/PLIST
+++ b/security/tor-browser/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/01/22 12:27:21 ryoon Exp $
bin/tor-browser
lib/tor-browser/application.ini
lib/tor-browser/browser/blocklist.xml
@@ -13,9 +13,9 @@ lib/tor-browser/browser/chrome/browser/content/branding/icon16.png
lib/tor-browser/browser/chrome/browser/content/branding/icon32.png
lib/tor-browser/browser/chrome/browser/content/branding/icon48.png
lib/tor-browser/browser/chrome/browser/content/branding/icon64.png
-lib/tor-browser/browser/chrome/browser/content/branding/identity-icons-brand.png
-lib/tor-browser/browser/chrome/browser/content/branding/identity-icons-brand@2x.png
+lib/tor-browser/browser/chrome/browser/content/branding/identity-icons-brand.svg
lib/tor-browser/browser/chrome/browser/content/branding/silhouette-40.svg
+lib/tor-browser/browser/chrome/browser/content/browser/aboutDialog-appUpdater.js
lib/tor-browser/browser/chrome/browser/content/browser/aboutDialog.css
lib/tor-browser/browser/chrome/browser/content/browser/aboutDialog.js
lib/tor-browser/browser/chrome/browser/content/browser/aboutDialog.xul
@@ -33,6 +33,8 @@ lib/tor-browser/browser/chrome/browser/content/browser/aboutSocialError.xhtml
lib/tor-browser/browser/chrome/browser/content/browser/aboutTabCrashed.css
lib/tor-browser/browser/chrome/browser/content/browser/aboutTabCrashed.js
lib/tor-browser/browser/chrome/browser/content/browser/aboutTabCrashed.xhtml
+lib/tor-browser/browser/chrome/browser/content/browser/aboutTabGroupsMigration.js
+lib/tor-browser/browser/chrome/browser/content/browser/aboutTabGroupsMigration.xhtml
lib/tor-browser/browser/chrome/browser/content/browser/aboutWelcomeBack.xhtml
lib/tor-browser/browser/chrome/browser/content/browser/aboutaccounts/aboutaccounts.css
lib/tor-browser/browser/chrome/browser/content/browser/aboutaccounts/aboutaccounts.js
@@ -50,8 +52,6 @@ lib/tor-browser/browser/chrome/browser/content/browser/abouthome/aboutHome.js
lib/tor-browser/browser/chrome/browser/content/browser/abouthome/aboutHome.xhtml
lib/tor-browser/browser/chrome/browser/content/browser/abouthome/addons.png
lib/tor-browser/browser/chrome/browser/content/browser/abouthome/addons@2x.png
-lib/tor-browser/browser/chrome/browser/content/browser/abouthome/apps.png
-lib/tor-browser/browser/chrome/browser/content/browser/abouthome/apps@2x.png
lib/tor-browser/browser/chrome/browser/content/browser/abouthome/bookmarks.png
lib/tor-browser/browser/chrome/browser/content/browser/abouthome/bookmarks@2x.png
lib/tor-browser/browser/chrome/browser/content/browser/abouthome/downloads.png
@@ -77,7 +77,27 @@ lib/tor-browser/browser/chrome/browser/content/browser/blockedSite.xhtml
lib/tor-browser/browser/chrome/browser/content/browser/bookmarks/bookmarksPanel.js
lib/tor-browser/browser/chrome/browser/content/browser/bookmarks/bookmarksPanel.xul
lib/tor-browser/browser/chrome/browser/content/browser/bookmarks/sidebarUtils.js
+lib/tor-browser/browser/chrome/browser/content/browser/browser-addons.js
+lib/tor-browser/browser/chrome/browser/content/browser/browser-ctrlTab.js
+lib/tor-browser/browser/chrome/browser/content/browser/browser-customization.js
+lib/tor-browser/browser/chrome/browser/content/browser/browser-data-submission-info-bar.js
+lib/tor-browser/browser/chrome/browser/content/browser/browser-devedition.js
+lib/tor-browser/browser/chrome/browser/content/browser/browser-eme.js
+lib/tor-browser/browser/chrome/browser/content/browser/browser-feeds.js
+lib/tor-browser/browser/chrome/browser/content/browser/browser-fullScreen.js
+lib/tor-browser/browser/chrome/browser/content/browser/browser-fullZoom.js
+lib/tor-browser/browser/chrome/browser/content/browser/browser-fxaccounts.js
+lib/tor-browser/browser/chrome/browser/content/browser/browser-gestureSupport.js
+lib/tor-browser/browser/chrome/browser/content/browser/browser-places.js
+lib/tor-browser/browser/chrome/browser/content/browser/browser-plugins.js
+lib/tor-browser/browser/chrome/browser/content/browser/browser-safebrowsing.js
+lib/tor-browser/browser/chrome/browser/content/browser/browser-sidebar.js
+lib/tor-browser/browser/chrome/browser/content/browser/browser-social.js
+lib/tor-browser/browser/chrome/browser/content/browser/browser-syncui.js
lib/tor-browser/browser/chrome/browser/content/browser/browser-tabPreviews.xml
+lib/tor-browser/browser/chrome/browser/content/browser/browser-tabsintitlebar.js
+lib/tor-browser/browser/chrome/browser/content/browser/browser-thumbnails.js
+lib/tor-browser/browser/chrome/browser/content/browser/browser-trackingprotection.js
lib/tor-browser/browser/chrome/browser/content/browser/browser.css
lib/tor-browser/browser/chrome/browser/content/browser/browser.js
lib/tor-browser/browser/chrome/browser/content/browser/browser.xul
@@ -87,6 +107,8 @@ lib/tor-browser/browser/chrome/browser/content/browser/chatWindow.xul
lib/tor-browser/browser/chrome/browser/content/browser/content-UITour.js
lib/tor-browser/browser/chrome/browser/content/browser/content-sessionStore.js
lib/tor-browser/browser/chrome/browser/content/browser/content.js
+lib/tor-browser/browser/chrome/browser/content/browser/contentSearchUI.css
+lib/tor-browser/browser/chrome/browser/content/browser/contentSearchUI.js
lib/tor-browser/browser/chrome/browser/content/browser/customizableui/aboutCustomizing.xul
lib/tor-browser/browser/chrome/browser/content/browser/customizableui/panelUI.css
lib/tor-browser/browser/chrome/browser/content/browser/customizableui/panelUI.js
@@ -112,136 +134,8 @@ lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/5.footer.pn
lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/5.header.png
lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/5.icon.jpg
lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/5.preview.jpg
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/NetworkPanel.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/animationinspector/animation-controller.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/animationinspector/animation-inspector.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/animationinspector/animation-panel.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/app-manager/connection-footer.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/app-manager/connection-footer.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/app-manager/device.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/app-manager/device.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/app-manager/help.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/app-manager/index.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/app-manager/index.xul
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/app-manager/manifest-editor.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/app-manager/projects.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/app-manager/projects.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/app-manager/template.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/app-manager/utils.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/canvasdebugger.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/canvasdebugger.xul
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/activeline.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/brace-fold.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/clike.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/closebrackets.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/codemirror.css
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/codemirror.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/comment-fold.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/comment.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/css.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/dialog.css
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/dialog.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/emacs.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/foldcode.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/foldgutter.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/htmlmixed.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/javascript.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/matchbrackets.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/mozilla.css
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/search.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/searchcursor.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/show-hint.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/sublime.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/tern.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/trailingspace.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/vim.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/xml-fold.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/codemirror/xml.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/commandline.css
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/commandline/commands-index.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/commandlineoutput.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/commandlinetooltip.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/computedview.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/connect.css
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/connect.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/connect.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/cssruleview.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/cubic-bezier-frame.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/cubic-bezier.css
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/d3.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/dagre-d3.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/debugger-controller.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/debugger-panes.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/debugger-toolbar.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/debugger-view.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/debugger.css
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/debugger.xul
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/eyedropper.xul
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/eyedropper/crosshairs.css
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/eyedropper/nocursor.css
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/fontinspector/font-inspector.css
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/fontinspector/font-inspector.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/fontinspector/font-inspector.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/frame-script-utils.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/framework/dev-edition-logo.png
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/framework/dev-edition-promo.css
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/framework/dev-edition-promo.xul
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/framework/options-panel.css
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/framework/toolbox-options.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/framework/toolbox-options.xul
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/framework/toolbox-process-window.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/framework/toolbox-process-window.xul
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/framework/toolbox-window.xul
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/framework/toolbox.xul
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/graphs-frame.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/inspector/inspector.css
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/inspector/inspector.xul
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/layoutview/view.css
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/layoutview/view.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/layoutview/view.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/markup-view.css
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/markup-view.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/netmonitor-controller.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/netmonitor-view.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/netmonitor.css
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/netmonitor.xul
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/profiler.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/profiler.xul
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/projecteditor-loader.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/projecteditor-loader.xul
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/projecteditor-test.xul
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/projecteditor.xul
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/readdir.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/responsivedesign/resize-commands.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/ruleview.css
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/scratchpad-commands.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/scratchpad.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/scratchpad.xul
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/shadereditor.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/shadereditor.xul
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/spectrum-frame.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/spectrum.css
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/splitview.css
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/storage.xul
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/styleeditor.css
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/styleeditor.xul
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/theme-switching.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/timeline/timeline.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/timeline/timeline.xul
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/ui-profile.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/ui-recordings.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/webaudioeditor.xul
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/webaudioeditor/controller.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/webaudioeditor/includes.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/webaudioeditor/models.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/webaudioeditor/views/automation.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/webaudioeditor/views/context.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/webaudioeditor/views/inspector.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/webaudioeditor/views/properties.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/webaudioeditor/views/utils.js
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/webconsole.xul
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/widgets.css
-lib/tor-browser/browser/chrome/browser/content/browser/devtools/widgets/VariablesView.xul
+lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/devedition.header.png
+lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/devedition.icon.png
lib/tor-browser/browser/chrome/browser/content/browser/downloads/allDownloadsViewOverlay.css
lib/tor-browser/browser/chrome/browser/content/browser/downloads/allDownloadsViewOverlay.js
lib/tor-browser/browser/chrome/browser/content/browser/downloads/allDownloadsViewOverlay.xul
@@ -255,117 +149,29 @@ lib/tor-browser/browser/chrome/browser/content/browser/downloads/downloads.js
lib/tor-browser/browser/chrome/browser/content/browser/downloads/downloadsOverlay.xul
lib/tor-browser/browser/chrome/browser/content/browser/downloads/indicator.js
lib/tor-browser/browser/chrome/browser/content/browser/downloads/indicatorOverlay.xul
-lib/tor-browser/browser/chrome/browser/content/browser/feeds/subscribe.css
+lib/tor-browser/browser/chrome/browser/content/browser/ext-bookmarks.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-browserAction.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-contextMenus.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-pageAction.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-tabs.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-utils.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-windows.js
+lib/tor-browser/browser/chrome/browser/content/browser/extension.svg
lib/tor-browser/browser/chrome/browser/content/browser/feeds/subscribe.js
lib/tor-browser/browser/chrome/browser/content/browser/feeds/subscribe.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/feeds/subscribe.xml
+lib/tor-browser/browser/chrome/browser/content/browser/gcli_sec_bad.svg
+lib/tor-browser/browser/chrome/browser/content/browser/gcli_sec_good.svg
+lib/tor-browser/browser/chrome/browser/content/browser/gcli_sec_moderate.svg
lib/tor-browser/browser/chrome/browser/content/browser/hiddenWindow.xul
lib/tor-browser/browser/chrome/browser/content/browser/history/history-panel.xul
lib/tor-browser/browser/chrome/browser/content/browser/license.html
-lib/tor-browser/browser/chrome/browser/content/browser/loop/conversation.html
-lib/tor-browser/browser/chrome/browser/content/browser/loop/css/contacts.css
-lib/tor-browser/browser/chrome/browser/content/browser/loop/css/panel.css
-lib/tor-browser/browser/chrome/browser/content/browser/loop/js/client.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/js/contacts.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/js/conversation.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/js/conversationAppStore.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/js/conversationViews.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/js/otconfig.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/js/panel.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/js/roomViews.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/libs/l10n.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/libs/sdk.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/panel.html
-lib/tor-browser/browser/chrome/browser/content/browser/loop/sdk-content/css/ot.css
-lib/tor-browser/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/access-denied-chrome.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/access-denied-copy-firefox.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/access-denied-firefox.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/access-predenied-chrome.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/access-prompt-chrome.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/audioonly-publisher.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/audioonly-subscriber.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/buttons.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/loader.gif
-lib/tor-browser/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/mic-off.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/mic-on.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/speaker-off.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/speaker-on.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/sdk-content/js/dynamic_config.min.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/css/common.css
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/css/conversation.css
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/css/reset.css
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/02.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/02@2x.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/audio-call-avatar.svg
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/audio-inverse-14x14.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/audio-inverse-14x14@2x.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/beta-ribbon.svg
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/dropdown-inverse.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/dropdown-inverse@2x.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/facemute-14x14.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/facemute-14x14@2x.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/hangup-inverse-14x14.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/hangup-inverse-14x14@2x.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/happy.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/icon_32.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/icon_64.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/icons-10x10.svg
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/icons-14x14.svg
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/icons-16x16.svg
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/movistar.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/movistar@2x.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/mute-inverse-14x14.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/mute-inverse-14x14@2x.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/sad.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/spinner.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/spinner@2x.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/svg/glyph-account-16x16.svg
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/svg/glyph-help-16x16.svg
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/svg/glyph-settings-16x16.svg
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/svg/glyph-signin-16x16.svg
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/svg/glyph-signout-16x16.svg
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/telefonica.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/telefonica@2x.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/video-inverse-14x14.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/video-inverse-14x14@2x.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/vivo.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/img/vivo@2x.png
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/js/actions.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/js/activeRoomStore.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/js/conversationStore.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/js/dispatcher.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/js/feedbackApiClient.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/js/feedbackStore.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/js/feedbackViews.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/js/fxOSActiveRoomStore.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/js/mixins.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/js/models.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/js/otSdkDriver.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/js/roomStates.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/js/roomStore.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/js/store.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/js/utils.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/js/validate.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/js/views.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/js/websocket.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/libs/backbone-1.1.2.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/libs/jquery-2.1.0.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/libs/lodash-2.4.1.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/libs/react-0.12.2.js
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/sounds/connected.ogg
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/sounds/connecting.ogg
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/sounds/failure.ogg
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/sounds/ringtone.ogg
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/sounds/room-joined-in.ogg
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/sounds/room-joined.ogg
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/sounds/room-left.ogg
-lib/tor-browser/browser/chrome/browser/content/browser/loop/shared/sounds/terminated.ogg
lib/tor-browser/browser/chrome/browser/content/browser/microsoft-translator-attribution.png
lib/tor-browser/browser/chrome/browser/content/browser/migration/migration.js
lib/tor-browser/browser/chrome/browser/content/browser/migration/migration.xul
lib/tor-browser/browser/chrome/browser/content/browser/newtab/newTab.css
+lib/tor-browser/browser/chrome/browser/content/browser/newtab/newTab.inadjacent.json
lib/tor-browser/browser/chrome/browser/content/browser/newtab/newTab.js
-lib/tor-browser/browser/chrome/browser/content/browser/newtab/newTab.xul
+lib/tor-browser/browser/chrome/browser/content/browser/newtab/newTab.xhtml
lib/tor-browser/browser/chrome/browser/content/browser/nsContextMenu.js
lib/tor-browser/browser/chrome/browser/content/browser/pageinfo/feeds.js
lib/tor-browser/browser/chrome/browser/content/browser/pageinfo/feeds.xml
@@ -394,21 +200,56 @@ lib/tor-browser/browser/chrome/browser/content/browser/places/places.xul
lib/tor-browser/browser/chrome/browser/content/browser/places/placesOverlay.xul
lib/tor-browser/browser/chrome/browser/content/browser/places/tree.xml
lib/tor-browser/browser/chrome/browser/content/browser/places/treeView.js
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/aboutPermissions.css
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/aboutPermissions.js
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/aboutPermissions.xml
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/aboutPermissions.xul
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/advanced.js
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/advanced.xul
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/main.js
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/css/firasans.css
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/css/normalize.css
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/css/saved.css
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/css/signup.css
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/fonts/FiraSans-Regular.woff
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketerror@1x.png
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketerror@2x.png
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketlogo@1x.png
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketlogo@2x.png
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketlogosolo@1x.png
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketlogosolo@2x.png
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketmenuitem16.png
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketmenuitem16@2x.png
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketsignup_button@1x.png
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketsignup_button@2x.png
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketsignup_devices@1x.png
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketsignup_devices@2x.png
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketsignup_hero@1x.png
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketsignup_hero@2x.png
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/signup_firefoxlogo@1x.png
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/signup_firefoxlogo@2x.png
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/signup_help@1x.png
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/signup_help@2x.png
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/tag_close@1x.png
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/tag_close@2x.png
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/tag_closeactive@1x.png
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/tag_closeactive@2x.png
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/js/messages.js
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/js/saved.js
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/js/signup.js
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/js/tmpl.js
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/js/vendor/handlebars.runtime.js
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/js/vendor/jquery-2.1.1.min.js
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/js/vendor/jquery.tokeninput.min.js
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/saved.html
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/signup.html
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/tmpl/saved_premiumextras.handlebars
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/tmpl/saved_premiumshell.handlebars
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/tmpl/saved_shell.handlebars
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/tmpl/signup_shell.handlebars
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/tmpl/signupstoryboard_shell.handlebars
+lib/tor-browser/browser/chrome/browser/content/browser/pocket/pktApi.js
lib/tor-browser/browser/chrome/browser/content/browser/preferences/applicationManager.js
lib/tor-browser/browser/chrome/browser/content/browser/preferences/applicationManager.xul
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/applications.js
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/applications.xul
+lib/tor-browser/browser/chrome/browser/content/browser/preferences/blocklists.js
+lib/tor-browser/browser/chrome/browser/content/browser/preferences/blocklists.xul
lib/tor-browser/browser/chrome/browser/content/browser/preferences/colors.xul
lib/tor-browser/browser/chrome/browser/content/browser/preferences/connection.js
lib/tor-browser/browser/chrome/browser/content/browser/preferences/connection.xul
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/content.js
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/content.xul
lib/tor-browser/browser/chrome/browser/content/browser/preferences/cookies.js
lib/tor-browser/browser/chrome/browser/content/browser/preferences/cookies.xul
lib/tor-browser/browser/chrome/browser/content/browser/preferences/fonts.js
@@ -429,30 +270,17 @@ lib/tor-browser/browser/chrome/browser/content/browser/preferences/in-content/su
lib/tor-browser/browser/chrome/browser/content/browser/preferences/in-content/sync.js
lib/tor-browser/browser/chrome/browser/content/browser/preferences/languages.js
lib/tor-browser/browser/chrome/browser/content/browser/preferences/languages.xul
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/main.js
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/main.xul
lib/tor-browser/browser/chrome/browser/content/browser/preferences/permissions.js
lib/tor-browser/browser/chrome/browser/content/browser/preferences/permissions.xul
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/preferences.js
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/preferences.xul
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/privacy.js
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/privacy.xul
lib/tor-browser/browser/chrome/browser/content/browser/preferences/sanitize.js
lib/tor-browser/browser/chrome/browser/content/browser/preferences/sanitize.xul
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/search.js
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/search.xul
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/security.js
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/security.xul
lib/tor-browser/browser/chrome/browser/content/browser/preferences/selectBookmark.js
lib/tor-browser/browser/chrome/browser/content/browser/preferences/selectBookmark.xul
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/sync.js
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/sync.xul
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/tabs.js
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/tabs.xul
lib/tor-browser/browser/chrome/browser/content/browser/preferences/translation.js
lib/tor-browser/browser/chrome/browser/content/browser/preferences/translation.xul
-lib/tor-browser/browser/chrome/browser/content/browser/readinglist/sidebar.js
-lib/tor-browser/browser/chrome/browser/content/browser/readinglist/sidebar.xhtml
+lib/tor-browser/browser/chrome/browser/content/browser/remote-newtab/newTab.css
+lib/tor-browser/browser/chrome/browser/content/browser/remote-newtab/newTab.js
+lib/tor-browser/browser/chrome/browser/content/browser/remote-newtab/newTab.xhtml
lib/tor-browser/browser/chrome/browser/content/browser/report-phishing-overlay.xul
lib/tor-browser/browser/chrome/browser/content/browser/safeMode.css
lib/tor-browser/browser/chrome/browser/content/browser/safeMode.js
@@ -461,14 +289,13 @@ lib/tor-browser/browser/chrome/browser/content/browser/sanitize.js
lib/tor-browser/browser/chrome/browser/content/browser/sanitize.xul
lib/tor-browser/browser/chrome/browser/content/browser/sanitizeDialog.css
lib/tor-browser/browser/chrome/browser/content/browser/sanitizeDialog.js
-lib/tor-browser/browser/chrome/browser/content/browser/search/engineManager.js
-lib/tor-browser/browser/chrome/browser/content/browser/search/engineManager.xul
+lib/tor-browser/browser/chrome/browser/content/browser/schemas/tabs.json
+lib/tor-browser/browser/chrome/browser/content/browser/schemas/windows.json
lib/tor-browser/browser/chrome/browser/content/browser/search/search.xml
lib/tor-browser/browser/chrome/browser/content/browser/search/searchbarBindings.css
-lib/tor-browser/browser/chrome/browser/content/browser/searchSuggestionUI.css
-lib/tor-browser/browser/chrome/browser/content/browser/searchSuggestionUI.js
lib/tor-browser/browser/chrome/browser/content/browser/setDesktopBackground.js
lib/tor-browser/browser/chrome/browser/content/browser/setDesktopBackground.xul
+lib/tor-browser/browser/chrome/browser/content/browser/social-content.js
lib/tor-browser/browser/chrome/browser/content/browser/socialchat.xml
lib/tor-browser/browser/chrome/browser/content/browser/socialmarks.xml
lib/tor-browser/browser/chrome/browser/content/browser/sync/aboutSyncTabs-bindings.xml
@@ -483,20 +310,12 @@ lib/tor-browser/browser/chrome/browser/content/browser/sync/customize.xul
lib/tor-browser/browser/chrome/browser/content/browser/sync/genericChange.js
lib/tor-browser/browser/chrome/browser/content/browser/sync/genericChange.xul
lib/tor-browser/browser/chrome/browser/content/browser/sync/key.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/sync/notification.xml
-lib/tor-browser/browser/chrome/browser/content/browser/sync/progress.js
-lib/tor-browser/browser/chrome/browser/content/browser/sync/progress.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/sync/quota.js
-lib/tor-browser/browser/chrome/browser/content/browser/sync/quota.xul
lib/tor-browser/browser/chrome/browser/content/browser/sync/setup.js
lib/tor-browser/browser/chrome/browser/content/browser/sync/setup.xul
lib/tor-browser/browser/chrome/browser/content/browser/sync/utils.js
+lib/tor-browser/browser/chrome/browser/content/browser/tab-content.js
lib/tor-browser/browser/chrome/browser/content/browser/tabbrowser.css
lib/tor-browser/browser/chrome/browser/content/browser/tabbrowser.xml
-lib/tor-browser/browser/chrome/browser/content/browser/tabview-content.js
-lib/tor-browser/browser/chrome/browser/content/browser/tabview.css
-lib/tor-browser/browser/chrome/browser/content/browser/tabview.html
-lib/tor-browser/browser/chrome/browser/content/browser/tabview.js
lib/tor-browser/browser/chrome/browser/content/browser/translation-infobar.xml
lib/tor-browser/browser/chrome/browser/content/browser/urlbarBindings.xml
lib/tor-browser/browser/chrome/browser/content/browser/utilityOverlay.js
@@ -505,23 +324,16 @@ lib/tor-browser/browser/chrome/browser/content/browser/web-panels.js
lib/tor-browser/browser/chrome/browser/content/browser/web-panels.xul
lib/tor-browser/browser/chrome/browser/content/browser/webrtcIndicator.js
lib/tor-browser/browser/chrome/browser/content/browser/webrtcIndicator.xul
-lib/tor-browser/browser/chrome/browser/defaults/permissions
lib/tor-browser/browser/chrome/browser/skin/classic/browser/Geolocation-16.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/Geolocation-64.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/Info.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/Privacy-16.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/Secure.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/Security-broken.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/Toolbar-inverted.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/Toolbar-small.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/Toolbar.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/aboutCertError.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/aboutCertError_sectionCollapsed-rtl.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/aboutCertError_sectionCollapsed.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/aboutCertError_sectionExpanded.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/aboutNetError.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/aboutNetError_alert.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/aboutNetError_info.svg
lib/tor-browser/browser/chrome/browser/skin/classic/browser/aboutProviderDirectory.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/aboutSessionRestore-window-icon.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/aboutSessionRestore.css
@@ -530,213 +342,61 @@ lib/tor-browser/browser/chrome/browser/skin/classic/browser/aboutSyncTabs.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/aboutTabCrashed.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/aboutWelcomeBack.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/actionicon-tab.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/bad-content-blocked-16.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/bad-content-blocked-16@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/bad-content-blocked-64.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/bad-content-unblocked-16.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/bad-content-unblocked-64.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/addons/addon-install-anchor.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/addons/addon-install-blocked.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/addons/addon-install-confirm.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/addons/addon-install-downloading.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/addons/addon-install-error.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/addons/addon-install-installed.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/addons/addon-install-restart.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/addons/addon-install-warning.svg
lib/tor-browser/browser/chrome/browser/skin/classic/browser/badge-add-engine.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/badge-add-engine@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/browser-lightweightTheme.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/browser.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/canvas-popup.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/cert-error.svg
lib/tor-browser/browser/chrome/browser/skin/classic/browser/click-to-play-warning-stripes.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/content-contextmenu.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/controlcenter/arrow-subview-back.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/controlcenter/arrow-subview.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/controlcenter/conn-degraded.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/controlcenter/conn-not-secure.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/controlcenter/conn-secure.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/controlcenter/mcb-disabled.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/controlcenter/panel.css
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/controlcenter/permissions.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/controlcenter/tracking-protection-disabled.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/controlcenter/tracking-protection.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/controlcenter/warning-gray.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/controlcenter/warning-yellow.svg
lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/background-noise-toolbar.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/customize-illustration-rtl.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/customize-illustration-rtl@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/customize-illustration.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/customize-illustration@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/customizeFavicon.ico
lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/customizeMode-gridTexture.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/customizeMode-separatorVertical.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/info-icon-customizeTip.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/info-icon-customizeTip@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/menuPanel-customizeFinish.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/menuPanel-customizeFinish@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/panelUIOverlay.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/panelarrow-customizeTip.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/panelarrow-customizeTip@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/subView-arrow-back-inverted-rtl.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/subView-arrow-back-inverted-rtl@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/subView-arrow-back-inverted.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/whimsy-bw.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/whimsy-bw@2x.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/subView-arrow-back-inverted@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/whimsy.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/whimsy@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/devedition.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devedition/search.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/devedition/urlbar-arrow.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/devedition/urlbar-arrow@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/devedition/urlbar-history-dropmarker.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/alerticon-warning.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/alerticon-warning@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/animationinspector.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/app-manager/add.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/app-manager/connection-footer.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/app-manager/default-app-icon.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/app-manager/device.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/app-manager/error.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/app-manager/help.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/app-manager/index-icons.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/app-manager/index.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/app-manager/noise.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/app-manager/plus.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/app-manager/projects.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/app-manager/remove.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/app-manager/rocket.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/app-manager/warning.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/arrow-e.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/arrow-e@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs-divider@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs-scrollbutton.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs-scrollbutton@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/canvasdebugger.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/close.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/close@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/command-console.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/command-console@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/command-eyedropper.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/command-eyedropper@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/command-frames.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/command-frames@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/command-paintflashing.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/command-paintflashing@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/command-pick.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/command-pick@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/command-responsivemode.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/command-responsivemode@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/command-scratchpad.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/command-scratchpad@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/command-screenshot.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/command-screenshot@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/command-tilt.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/command-tilt@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/commandline-icon.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/commandline-icon@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/commandline.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/common.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/computedview.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/controls.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/controls@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/cubic-bezier-swatch.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/cubic-bezier-swatch@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/dark-theme.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/debugger-blackbox.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/debugger-blackbox@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/debugger-collapse.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/debugger-collapse@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/debugger-expand.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/debugger-expand@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/debugger-pause.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/debugger-pause@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/debugger-play.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/debugger-play@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/debugger-prettyprint.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/debugger-prettyprint@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-in.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-in@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-out.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-out@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-over.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-over@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/debugger-toggleBreakpoints.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/debugger-toggleBreakpoints@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/debugger.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/dock-bottom@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/dock-side@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/dropmarker.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/editor-breakpoint.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/editor-debug-location.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/editor-debug-location@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/editor-error.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/eyedropper.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/filetype-dir-close.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/filetype-dir-open.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/filetype-globe.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/filetype-store.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/filters.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/floating-scrollbars-light.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/floating-scrollbars.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/font-inspector.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/inspector.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-dark-ltr.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-dark-rtl.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-ltr.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-rtl.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/itemToggle.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/itemToggle@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/layoutview.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/light-theme.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/magnifying-glass-light.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/magnifying-glass-light@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/magnifying-glass.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/magnifying-glass@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/markup-view.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/netmonitor.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/newtab-inverted.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/newtab-inverted@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/newtab.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/newtab@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/noise.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/performance-icons.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/performance.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/power.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/profiler-stopwatch-checked.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/profiler-stopwatch.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/profiler.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/projecteditor/projecteditor.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/responsive-horizontal-resizer.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/responsive-horizontal-resizer@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/responsive-se-resizer.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/responsive-se-resizer@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/responsive-vertical-resizer.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/responsive-vertical-resizer@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-home.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-rotate.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-rotate@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-screenshot.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-screenshot@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-touch.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-touch@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/ruleview.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/scratchpad.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/shadereditor.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/splitview.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/storage.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/styleeditor.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/timeline-filter.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/timeline.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/toggle-tools.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/toggle-tools@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/tool-debugger-paused.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/tool-debugger.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/tool-inspector.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/tool-network.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/tool-options.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/tool-profiler.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/tool-scratchpad.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/tool-storage.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/tool-styleeditor.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/tool-webaudio.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/tool-webconsole.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/tooltip/arrow-horizontal-dark.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/tooltip/arrow-horizontal-dark@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/tooltip/arrow-horizontal-light.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/tooltip/arrow-horizontal-light@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/tooltip/arrow-vertical-dark.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/tooltip/arrow-vertical-dark@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/tooltip/arrow-vertical-light.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/tooltip/arrow-vertical-light@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/tracer-icon.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/tracer-icon@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/undock@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/vview-delete.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/vview-delete@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/vview-edit.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/vview-edit@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/vview-lock.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/vview-lock@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/vview-open-inspector.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/vview-open-inspector@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/webaudioeditor.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/webconsole.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/webconsole.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/webconsole@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/webconsole_networkpanel.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/widgets.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/downloads/allDownloadsViewOverlay.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/downloads/buttons.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/downloads/contentAreaDownloadsView.css
@@ -746,52 +406,63 @@ lib/tor-browser/browser/chrome/browser/skin/classic/browser/downloads/download-n
lib/tor-browser/browser/chrome/browser/skin/classic/browser/downloads/download-summary.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/downloads/downloads.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/drm-icon.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/engineManager.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/feeds/audioFeedIcon.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/feeds/audioFeedIcon16.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/feeds/feedIcon.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/feeds/feedIcon16.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/feeds/subscribe-ui.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/feeds/subscribe.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/feeds/videoFeedIcon.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/feeds/videoFeedIcon16.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/fullscreen-darknoise.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/fullscreen/insecure.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/fullscreen/secure.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/fxa/android.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/fxa/android@2x.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/fxa/default-avatar.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/fxa/default-avatar@2x.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/fxa/logo.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/fxa/logo@2x.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/fxa/sync-illustration.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/fxa/sync-illustration.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/fxa/sync-illustration@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/heartbeat-icon.svg
lib/tor-browser/browser/chrome/browser/skin/classic/browser/heartbeat-star-lit.svg
lib/tor-browser/browser/chrome/browser/skin/classic/browser/heartbeat-star-off.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/identity-icons-generic.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/identity-icons-https-ev.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/identity-icons-https-mixed-active.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/identity-icons-https-mixed-display.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/identity-icons-https.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/identity.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/loop/menuPanel.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/loop/toolbar-inverted.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/loop/toolbar.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/magnifier.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/magnifier@2x.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/mask.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/mask@2x.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/identity-icon.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/identity-mixed-active-blocked.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/identity-mixed-active-loaded.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/identity-mixed-passive-loaded.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/identity-not-secure.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/identity-secure.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/info.svg
lib/tor-browser/browser/chrome/browser/skin/classic/browser/menuPanel-customize.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/menuPanel-customize@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/menuPanel-exit.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/menuPanel-exit@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/menuPanel-help.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/menuPanel-help@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/menuPanel-small.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/menuPanel-small@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/menuPanel.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/menuPanel@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/monitor.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/monitor_16-10.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/newtab/close.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/newtab/controls.svg
lib/tor-browser/browser/chrome/browser/skin/classic/browser/newtab/newTab.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-16.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-64.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/newtab/whimsycorn.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-pluginAlert.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-pluginAlert@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-pluginBlocked.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-pluginBlocked@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-pluginNormal.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-pluginNormal@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/page-livemarks.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/pageInfo.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/pageInfo.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/panic-panel/header-small.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/panic-panel/header-small@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/panic-panel/header.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/panic-panel/header@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/panic-panel/icons.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/panic-panel/icons@2x.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/autocomplete-star.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/bookmarks-menu-arrow.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/bookmarks-notification-finish.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/bookmarksMenu.png
@@ -805,7 +476,6 @@ lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/organizer.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/organizer.xml
lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/places.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/query.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/star-icons.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/starred48.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/tag.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/toolbarDropMarker.png
@@ -815,7 +485,6 @@ lib/tor-browser/browser/chrome/browser/skin/classic/browser/pointerLock-16.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/pointerLock-64.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/Options-sync.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/Options.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/aboutPermissions.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/alwaysAsk.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/applications.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/dialog.css
@@ -827,18 +496,28 @@ lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/mail.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/preferences.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/search.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/privatebrowsing-mask.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/privatebrowsing/attention.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/privatebrowsing/attention@2x.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/privatebrowsing/check.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/privatebrowsing/check@2x.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/privatebrowsing/mask.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/privatebrowsing/shield-page.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/privatebrowsing/shield-page@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/reader-tour.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/reader-tour@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/readerMode.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/readinglist/icons.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/readinglist/readinglist-icon.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/readinglist/sidebar.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/reload-stop-go.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/reload-stop-go@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/sanitizeDialog.css
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/search-arrow-go.svg
lib/tor-browser/browser/chrome/browser/skin/classic/browser/search-engine-placeholder.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/search-engine-placeholder@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/search-history-icon.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/search-indicator-add-engine.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/search-indicator-badge-add.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/search-indicator-badge-add@2x.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/search-indicator-magnifying-glass.svg
lib/tor-browser/browser/chrome/browser/skin/classic/browser/search-indicator.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/search-indicator@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/search-pref.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/searchbar.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/session-restore.svg
@@ -857,14 +536,16 @@ lib/tor-browser/browser/chrome/browser/skin/classic/browser/sync-32.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/sync-bg.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/sync-desktopIcon.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/sync-horizontalbar.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/sync-horizontalbar@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/sync-mobileIcon.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/sync-notification-24.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/syncCommon.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/syncProgress-horizontalbar.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/syncProgress-horizontalbar@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/syncProgress-menuPanel.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/syncProgress-menuPanel@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/syncProgress-toolbar-inverted.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/syncProgress-toolbar.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/syncProgress.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/syncQuota.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/syncSetup.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/tab-crashed.svg
@@ -877,47 +558,918 @@ lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/pendingpa
lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-active-middle.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-arrow-left.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-audio-small.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-audio.svg
lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-background-end.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-background-middle.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-background-start.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-overflow-indicator.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-selected-end.svg
lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-selected-start.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-separator.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-stroke-end.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-stroke-start.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/tabDragIndicator.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabview/edit-light.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabview/search.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabview/stack-expander.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabview/tabview.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabview/tabview.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/theme-switcher-icon.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/theme-switcher-icon@2x.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/tracking-protection-16.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/tracking-protection-disabled-16.svg
lib/tor-browser/browser/chrome/browser/skin/classic/browser/translating-16.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/translating-16@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/translation-16.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/translation-16@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/undoCloseTab.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/undoCloseTab@2x.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/update-badge-failed.svg
lib/tor-browser/browser/chrome/browser/skin/classic/browser/update-badge.svg
lib/tor-browser/browser/chrome/browser/skin/classic/browser/urlbar-arrow.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/warning16.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/warning16@2x.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/urlbar-arrow@2x.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/usercontext/banking.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/usercontext/personal.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/usercontext/shopping.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/usercontext/work.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/warning.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/web-notifications-icon.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/web-notifications-tray.svg
lib/tor-browser/browser/chrome/browser/skin/classic/browser/webRTC-camera-white-16.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/webRTC-indicator.css
lib/tor-browser/browser/chrome/browser/skin/classic/browser/webRTC-microphone-white-16.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/webRTC-screen-white-16.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/webRTC-shareDevice-16.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/webRTC-shareDevice-16@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/webRTC-shareDevice-64.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/webRTC-shareDevice-64@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/webRTC-shareMicrophone-16.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/webRTC-shareMicrophone-16@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/webRTC-shareMicrophone-64.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/webRTC-shareMicrophone-64@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/webRTC-shareScreen-16.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/webRTC-shareScreen-16@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/webRTC-shareScreen-64.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/webRTC-shareScreen-64@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/webRTC-sharingDevice-16.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/webRTC-sharingDevice-16@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/webRTC-sharingMicrophone-16.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/webRTC-sharingMicrophone-16@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/webRTC-sharingScreen-16.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/webRTC-sharingScreen-16@2x.png
lib/tor-browser/browser/chrome/browser/skin/classic/browser/welcome-back.svg
lib/tor-browser/browser/chrome/browser/skin/classic/communicator/communicator.css
lib/tor-browser/browser/chrome/chrome.manifest
+lib/tor-browser/browser/chrome/devtools/content/aboutdebugging/aboutdebugging.css
+lib/tor-browser/browser/chrome/devtools/content/aboutdebugging/aboutdebugging.js
+lib/tor-browser/browser/chrome/devtools/content/aboutdebugging/aboutdebugging.xhtml
+lib/tor-browser/browser/chrome/devtools/content/animationinspector/animation-controller.js
+lib/tor-browser/browser/chrome/devtools/content/animationinspector/animation-inspector.xhtml
+lib/tor-browser/browser/chrome/devtools/content/animationinspector/animation-panel.js
+lib/tor-browser/browser/chrome/devtools/content/canvasdebugger/callslist.js
+lib/tor-browser/browser/chrome/devtools/content/canvasdebugger/canvasdebugger.js
+lib/tor-browser/browser/chrome/devtools/content/canvasdebugger/canvasdebugger.xul
+lib/tor-browser/browser/chrome/devtools/content/canvasdebugger/snapshotslist.js
+lib/tor-browser/browser/chrome/devtools/content/commandline/commandline.css
+lib/tor-browser/browser/chrome/devtools/content/commandline/commandlineoutput.xhtml
+lib/tor-browser/browser/chrome/devtools/content/commandline/commandlinetooltip.xhtml
+lib/tor-browser/browser/chrome/devtools/content/debugger/debugger-controller.js
+lib/tor-browser/browser/chrome/devtools/content/debugger/debugger-view.js
+lib/tor-browser/browser/chrome/devtools/content/debugger/debugger.css
+lib/tor-browser/browser/chrome/devtools/content/debugger/debugger.xul
+lib/tor-browser/browser/chrome/devtools/content/debugger/utils.js
+lib/tor-browser/browser/chrome/devtools/content/debugger/views/filter-view.js
+lib/tor-browser/browser/chrome/devtools/content/debugger/views/global-search-view.js
+lib/tor-browser/browser/chrome/devtools/content/debugger/views/options-view.js
+lib/tor-browser/browser/chrome/devtools/content/debugger/views/stack-frames-classic-view.js
+lib/tor-browser/browser/chrome/devtools/content/debugger/views/stack-frames-view.js
+lib/tor-browser/browser/chrome/devtools/content/debugger/views/toolbar-view.js
+lib/tor-browser/browser/chrome/devtools/content/debugger/views/variable-bubble-view.js
+lib/tor-browser/browser/chrome/devtools/content/debugger/views/watch-expressions-view.js
+lib/tor-browser/browser/chrome/devtools/content/debugger/views/workers-view.js
+lib/tor-browser/browser/chrome/devtools/content/eyedropper/crosshairs.css
+lib/tor-browser/browser/chrome/devtools/content/eyedropper/eyedropper.xul
+lib/tor-browser/browser/chrome/devtools/content/eyedropper/nocursor.css
+lib/tor-browser/browser/chrome/devtools/content/fontinspector/font-inspector.css
+lib/tor-browser/browser/chrome/devtools/content/fontinspector/font-inspector.js
+lib/tor-browser/browser/chrome/devtools/content/fontinspector/font-inspector.xhtml
+lib/tor-browser/browser/chrome/devtools/content/framework/connect/connect.css
+lib/tor-browser/browser/chrome/devtools/content/framework/connect/connect.js
+lib/tor-browser/browser/chrome/devtools/content/framework/connect/connect.xhtml
+lib/tor-browser/browser/chrome/devtools/content/framework/dev-edition-promo/dev-edition-logo.png
+lib/tor-browser/browser/chrome/devtools/content/framework/dev-edition-promo/dev-edition-promo.css
+lib/tor-browser/browser/chrome/devtools/content/framework/dev-edition-promo/dev-edition-promo.xul
+lib/tor-browser/browser/chrome/devtools/content/framework/options-panel.css
+lib/tor-browser/browser/chrome/devtools/content/framework/toolbox-options.js
+lib/tor-browser/browser/chrome/devtools/content/framework/toolbox-options.xul
+lib/tor-browser/browser/chrome/devtools/content/framework/toolbox-process-window.js
+lib/tor-browser/browser/chrome/devtools/content/framework/toolbox-process-window.xul
+lib/tor-browser/browser/chrome/devtools/content/framework/toolbox-window.xul
+lib/tor-browser/browser/chrome/devtools/content/framework/toolbox.xul
+lib/tor-browser/browser/chrome/devtools/content/inspector/inspector.css
+lib/tor-browser/browser/chrome/devtools/content/inspector/inspector.xul
+lib/tor-browser/browser/chrome/devtools/content/layoutview/view.js
+lib/tor-browser/browser/chrome/devtools/content/layoutview/view.xhtml
+lib/tor-browser/browser/chrome/devtools/content/markupview/markup-view.css
+lib/tor-browser/browser/chrome/devtools/content/markupview/markup-view.xhtml
+lib/tor-browser/browser/chrome/devtools/content/memory/initializer.js
+lib/tor-browser/browser/chrome/devtools/content/memory/memory.xhtml
+lib/tor-browser/browser/chrome/devtools/content/netmonitor/netmonitor-controller.js
+lib/tor-browser/browser/chrome/devtools/content/netmonitor/netmonitor-view.js
+lib/tor-browser/browser/chrome/devtools/content/netmonitor/netmonitor.css
+lib/tor-browser/browser/chrome/devtools/content/netmonitor/netmonitor.xul
+lib/tor-browser/browser/chrome/devtools/content/performance/performance-controller.js
+lib/tor-browser/browser/chrome/devtools/content/performance/performance-view.js
+lib/tor-browser/browser/chrome/devtools/content/performance/performance.xul
+lib/tor-browser/browser/chrome/devtools/content/performance/views/details-abstract-subview.js
+lib/tor-browser/browser/chrome/devtools/content/performance/views/details-js-call-tree.js
+lib/tor-browser/browser/chrome/devtools/content/performance/views/details-js-flamegraph.js
+lib/tor-browser/browser/chrome/devtools/content/performance/views/details-memory-call-tree.js
+lib/tor-browser/browser/chrome/devtools/content/performance/views/details-memory-flamegraph.js
+lib/tor-browser/browser/chrome/devtools/content/performance/views/details-waterfall.js
+lib/tor-browser/browser/chrome/devtools/content/performance/views/details.js
+lib/tor-browser/browser/chrome/devtools/content/performance/views/optimizations-list.js
+lib/tor-browser/browser/chrome/devtools/content/performance/views/overview.js
+lib/tor-browser/browser/chrome/devtools/content/performance/views/recordings.js
+lib/tor-browser/browser/chrome/devtools/content/performance/views/toolbar.js
+lib/tor-browser/browser/chrome/devtools/content/projecteditor/chrome/content/projecteditor-loader.js
+lib/tor-browser/browser/chrome/devtools/content/projecteditor/chrome/content/projecteditor-loader.xul
+lib/tor-browser/browser/chrome/devtools/content/projecteditor/chrome/content/projecteditor-test.xul
+lib/tor-browser/browser/chrome/devtools/content/projecteditor/chrome/content/projecteditor.xul
+lib/tor-browser/browser/chrome/devtools/content/projecteditor/lib/helpers/readdir.js
+lib/tor-browser/browser/chrome/devtools/content/promisedebugger/promise-controller.js
+lib/tor-browser/browser/chrome/devtools/content/promisedebugger/promise-debugger.xhtml
+lib/tor-browser/browser/chrome/devtools/content/promisedebugger/promise-panel.js
+lib/tor-browser/browser/chrome/devtools/content/scratchpad/scratchpad.js
+lib/tor-browser/browser/chrome/devtools/content/scratchpad/scratchpad.xul
+lib/tor-browser/browser/chrome/devtools/content/shadereditor/shadereditor.js
+lib/tor-browser/browser/chrome/devtools/content/shadereditor/shadereditor.xul
+lib/tor-browser/browser/chrome/devtools/content/shared/frame-script-utils.js
+lib/tor-browser/browser/chrome/devtools/content/shared/splitview.css
+lib/tor-browser/browser/chrome/devtools/content/shared/theme-switching.js
+lib/tor-browser/browser/chrome/devtools/content/shared/vendor/d3.js
+lib/tor-browser/browser/chrome/devtools/content/shared/vendor/dagre-d3.js
+lib/tor-browser/browser/chrome/devtools/content/shared/widgets/VariablesView.xul
+lib/tor-browser/browser/chrome/devtools/content/shared/widgets/cubic-bezier-frame.xhtml
+lib/tor-browser/browser/chrome/devtools/content/shared/widgets/cubic-bezier.css
+lib/tor-browser/browser/chrome/devtools/content/shared/widgets/filter-frame.xhtml
+lib/tor-browser/browser/chrome/devtools/content/shared/widgets/filter-widget.css
+lib/tor-browser/browser/chrome/devtools/content/shared/widgets/graphs-frame.xhtml
+lib/tor-browser/browser/chrome/devtools/content/shared/widgets/mdn-docs-frame.xhtml
+lib/tor-browser/browser/chrome/devtools/content/shared/widgets/mdn-docs.css
+lib/tor-browser/browser/chrome/devtools/content/shared/widgets/spectrum-frame.xhtml
+lib/tor-browser/browser/chrome/devtools/content/shared/widgets/spectrum.css
+lib/tor-browser/browser/chrome/devtools/content/shared/widgets/widgets.css
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/codemirror.css
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/codemirror.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/comment/comment.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/dialog/dialog.css
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/dialog/dialog.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/edit/closebrackets.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/edit/matchbrackets.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/edit/trailingspace.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/fold/brace-fold.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/fold/comment-fold.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/fold/foldcode.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/fold/foldgutter.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/fold/xml-fold.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/hint/show-hint.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/keymap/emacs.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/keymap/sublime.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/keymap/vim.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/mode/clike.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/mode/css.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/mode/htmlmixed.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/mode/javascript.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/mode/xml.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/mozilla.css
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/search/search.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/search/searchcursor.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/selection/active-line.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/tern/tern.js
+lib/tor-browser/browser/chrome/devtools/content/storage/storage.xul
+lib/tor-browser/browser/chrome/devtools/content/styleeditor/styleeditor.css
+lib/tor-browser/browser/chrome/devtools/content/styleeditor/styleeditor.xul
+lib/tor-browser/browser/chrome/devtools/content/styleinspector/computedview.xhtml
+lib/tor-browser/browser/chrome/devtools/content/styleinspector/cssruleview.xhtml
+lib/tor-browser/browser/chrome/devtools/content/styleinspector/ruleview.css
+lib/tor-browser/browser/chrome/devtools/content/webaudioeditor/controller.js
+lib/tor-browser/browser/chrome/devtools/content/webaudioeditor/includes.js
+lib/tor-browser/browser/chrome/devtools/content/webaudioeditor/models.js
+lib/tor-browser/browser/chrome/devtools/content/webaudioeditor/views/automation.js
+lib/tor-browser/browser/chrome/devtools/content/webaudioeditor/views/context.js
+lib/tor-browser/browser/chrome/devtools/content/webaudioeditor/views/inspector.js
+lib/tor-browser/browser/chrome/devtools/content/webaudioeditor/views/properties.js
+lib/tor-browser/browser/chrome/devtools/content/webaudioeditor/views/utils.js
+lib/tor-browser/browser/chrome/devtools/content/webaudioeditor/webaudioeditor.xul
+lib/tor-browser/browser/chrome/devtools/content/webconsole/webconsole.xul
+lib/tor-browser/browser/chrome/devtools/modules/devtools/acorn/acorn.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/acorn/acorn_loose.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/acorn/walk.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/target-list.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/target.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/animationinspector/components.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/animationinspector/utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/canvasdebugger/panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/debugger/content/actions/breakpoints.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/debugger/content/actions/event-listeners.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/debugger/content/actions/sources.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/debugger/content/constants.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/debugger/content/globalActions.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/debugger/content/queries.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/debugger/content/reducers/async-requests.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/debugger/content/reducers/breakpoints.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/debugger/content/reducers/event-listeners.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/debugger/content/reducers/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/debugger/content/reducers/sources.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/debugger/content/utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/debugger/content/views/event-listeners-view.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/debugger/content/views/sources-view.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/debugger/debugger-commands.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/debugger/panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/definitions.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/eyedropper/commands.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/eyedropper/eyedropper-child.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/eyedropper/eyedropper.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/framework/ToolboxProcess.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/framework/gDevTools.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/framework/selection.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/framework/sidebar.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/framework/target.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/framework/toolbox-highlighter-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/framework/toolbox-hosts.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/framework/toolbox-options.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/framework/toolbox.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/breadcrumbs.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/inspector-commands.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/inspector-panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/inspector-search.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/headers-panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/headers.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/json-panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/main-tabbed-area.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/reps/array.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/reps/caption.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/reps/null.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/reps/number.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/reps/object-box.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/reps/object-link.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/reps/object.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/reps/rep-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/reps/rep.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/reps/string.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/reps/tabs.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/reps/toolbar.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/reps/tree-view.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/reps/undefined.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/search-box.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/text-panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/converter-child.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/converter-observer.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/converter-sniffer.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/css/dom-tree.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/css/general.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/css/headers-panel.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/css/json-panel.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/css/main.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/css/read-only-prop.svg
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/css/reps.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/css/search-box.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/css/search.svg
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/css/tabs.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/css/text-panel.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/css/toolbar.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/css/twisty-closed.svg
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/css/twisty-open.svg
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/json-viewer.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/lib/require.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/main.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/viewer-config.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/main.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/markupview/html-editor.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/markupview/markup-view.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/actions/allocations.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/actions/breakdown.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/actions/diffing.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/actions/filter.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/actions/inverted.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/actions/io.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/actions/refresh.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/actions/snapshot.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/app.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/components/frame.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/components/heap.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/components/list.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/components/snapshot-list-item.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/components/toolbar.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/components/tree-item.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/constants.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/initializer.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/models.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/reducers.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/reducers/allocations.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/reducers/breakdown.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/reducers/diffing.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/reducers/errors.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/reducers/filter.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/reducers/inverted.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/reducers/snapshots.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/store.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-automation.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-builder.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-collector.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-exporter.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/har/toolbox-overlay.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/events.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/legacy/actors.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/legacy/compatibility.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/legacy/front.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/legacy/recording.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/modules/global.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/modules/io.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/modules/logic/frame-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/modules/logic/jit.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/modules/logic/marker-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/modules/logic/telemetry.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/modules/logic/tree-model.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/modules/logic/waterfall-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/modules/markers.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/modules/widgets/graphs.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/modules/widgets/marker-details.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/modules/widgets/marker-view.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/modules/widgets/markers-overview.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/modules/widgets/tree-view.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/modules/widgets/waterfall-ticks.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/editors.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/helpers/event.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/helpers/file-picker.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/helpers/l10n.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/helpers/prompts.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/helpers/readdir.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/app-manager/app-project-editor.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/app-manager/plugin.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/core.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/delete/delete.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/dirty/dirty.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/image-view/image-editor.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/image-view/plugin.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/logging/logging.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/new/new.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/rename/rename.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/save/save.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/status-bar/plugin.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/project.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/projecteditor.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/shells.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/stores/base.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/stores/local.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/stores/resource.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/tree.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsivedesign/resize-commands.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsivedesign/responsivedesign-child.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsivedesign/responsivedesign.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/scratchpad/scratchpad-commands.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/scratchpad/scratchpad-manager.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/scratchpad/scratchpad-panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shadereditor/panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/AppCacheUtils.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/Curl.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/DOMHelpers.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/DeveloperToolbar.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/Jsbeautify.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/SplitView.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/autocomplete-popup.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/browser-loader.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/tree.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/css-parsing-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/devices.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/doorhanger.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/frame-script-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/getjson.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/inplace-editor.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/node-attribute-parser.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/observable-object.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/options-view.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/output-parser.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/poller.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/redux/create-store.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/history.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/log.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/promise.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/task.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/thunk.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/wait-service.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/redux/non-react-subscriber.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/source-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/telemetry.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/theme-switching.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/theme.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/undo.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-redux.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/vendor/react.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/vendor/redux.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/vendor/seamless-immutable.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/AbstractTreeItem.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/BarGraphWidget.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/BreadcrumbsWidget.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/Chart.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/CubicBezierPresets.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/CubicBezierWidget.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/FastListWidget.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/FilterWidget.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/FlameGraph.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/Graphs.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/GraphsWorker.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/LineGraphWidget.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/MdnDocsWidget.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/MountainGraphWidget.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/SideMenuWidget.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/SimpleListWidget.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/Spectrum.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/TableWidget.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/Tooltip.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/TreeWidget.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/VariablesView.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/VariablesViewController.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/ViewHelpers.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/sourceeditor/autocomplete.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/sourceeditor/css-autocompleter.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/sourceeditor/debugger.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/sourceeditor/editor.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/sourceeditor/tern/browser.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/sourceeditor/tern/comment.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/sourceeditor/tern/condense.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/sourceeditor/tern/def.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/sourceeditor/tern/ecma5.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/sourceeditor/tern/infer.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/sourceeditor/tern/signal.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/sourceeditor/tern/tern.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/storage/panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/storage/ui.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/styleeditor/StyleEditorUI.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/styleeditor/StyleEditorUtil.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/styleeditor/StyleSheetEditor.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/styleeditor/styleeditor-commands.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/styleeditor/styleeditor-panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/styleeditor/utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/styleinspector/computed-view.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/styleinspector/rule-view.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/styleinspector/style-inspector-menu.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/styleinspector/style-inspector-overlays.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/styleinspector/style-inspector.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/styleinspector/utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/themes/variables.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/tilt/TiltWorkerCrafter.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/tilt/TiltWorkerPicker.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/tilt/tilt-commands.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/tilt/tilt-gl.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/tilt/tilt-math.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/tilt/tilt-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/tilt/tilt-visualizer-style.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/tilt/tilt-visualizer.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/tilt/tilt.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webaudioeditor/panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/console-commands.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/console-output.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/hudservice.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/webconsole.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webide/modules/addons.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webide/modules/app-manager.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webide/modules/app-projects.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webide/modules/app-validator.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webide/modules/build.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webide/modules/config-view.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webide/modules/project-list.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webide/modules/runtime-list.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webide/modules/runtimes.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webide/modules/simulator-process.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webide/modules/simulators.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webide/modules/tab-store.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webide/modules/utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/actor-registry.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/addon.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/animation.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/call-watcher.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/canvas.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/child-process.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/childtab.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/chrome.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/common.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/csscoverage.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/device.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/director-manager.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/director-registry.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/eventlooplag.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/framerate.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/gcli.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/heap-snapshot-file.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/highlighters.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/highlighters.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/highlighters/auto-refresh.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/highlighters/box-model.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/highlighters/css-transform.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/highlighters/geometry-editor.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/highlighters/measuring-tool.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/highlighters/rect.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/highlighters/rulers.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/highlighters/selector.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/highlighters/simple-outline.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/highlighters/utils/markup.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/inspector.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/layout.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/memory.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/memprof.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/monitor.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/object.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/performance-entries.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/performance-recording.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/performance.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/preference.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/pretty-print-worker.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/process.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/profiler.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/promises.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/root.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/script.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/settings.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/storage.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/string.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/styleeditor.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/styles.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/stylesheets.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/timeline.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/utils/ScriptStore.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/utils/TabSources.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/utils/actor-registry-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/utils/audionodes.json
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/utils/automation-timeline.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/utils/make-debugger.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/utils/map-uri-to-addon-id.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/utils/stack.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/utils/walker-search.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/webapps.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/webaudio.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/webbrowser.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/webconsole.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/webgl.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/worker.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/child.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/content-globals.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/content-server.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/main.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/performance/framerate.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/performance/memory.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/performance/profiler.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/performance/recorder.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/performance/timeline.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/protocol.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/worker.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/DevToolsUtils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/Loader.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/Parser.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/apps/Devices.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/apps/Simulator.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/apps/app-actor-front.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/async-storage.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/async-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/client/connection-manager.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/client/main.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/content-observer.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/css-color.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/deprecated-sync-thenables.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/discovery/discovery.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/event-emitter.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/event-parsers.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/Templater.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/commands/addon.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/commands/appcache.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/commands/calllog.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/commands/cmd.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/commands/cookie.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/commands/csscoverage.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/commands/folder.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/commands/highlight.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/commands/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/commands/inject.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/commands/jsb.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/commands/listen.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/commands/measure.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/commands/media.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/commands/pagemod.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/commands/paintflashing.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/commands/qsa.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/commands/restart.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/commands/rulers.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/commands/screenshot.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/commands/security.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/commands/tools.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/cli.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/clear.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/commands.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/connect.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/context.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/exec.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/global.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/help.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/intro.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/lang.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/mocks.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/pref.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/preflist.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/test.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/connectors/connectors.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/converters/basic.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/converters/converters.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/converters/html.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/converters/terminal.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/fields/delegate.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/fields/fields.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/fields/selection.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/l10n.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/languages/command.html
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/languages/command.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/languages/javascript.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/languages/languages.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/mozui/completer.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/mozui/inputter.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/mozui/tooltip.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/settings.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/system.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/types/array.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/types/boolean.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/types/command.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/types/date.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/types/delegate.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/types/file.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/types/fileparser.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/types/javascript.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/types/node.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/types/number.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/types/resource.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/types/selection.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/types/setting.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/types/string.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/types/types.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/types/union.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/types/url.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/ui/focus.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/ui/history.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/ui/intro.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/ui/menu.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/ui/menu.html
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/ui/menu.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/ui/view.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/util/domtemplate.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/util/fileparser.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/util/filesystem.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/util/host.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/util/l10n.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/util/legacy.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/util/prism.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/util/spell.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/util/util.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/heapsnapshot/CensusUtils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/heapsnapshot/DominatorTreeNode.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/heapsnapshot/HeapAnalysesClient.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/heapsnapshot/HeapAnalysesWorker.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/heapsnapshot/HeapSnapshotFileUtils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/heapsnapshot/census-tree-node.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/indentation.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/jsbeautify/beautify.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/jsbeautify/lib/sanitytest.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/jsbeautify/lib/urlencode_unpacker.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/jsbeautify/src/beautify-css.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/jsbeautify/src/beautify-html.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/jsbeautify/src/beautify-js.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/jsbeautify/src/beautify-tests.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/layout/utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/path.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/performance/process-communication.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/performance/recording-common.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/performance/recording-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/pretty-fast/pretty-fast.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/qrcode/decoder/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/qrcode/encoder/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/qrcode/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/security/auth.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/security/cert.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/security/prompt.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/security/socket.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/sourcemap/source-map.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/styleinspector/css-logic.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/system.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/touch/simulator-content.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/touch/simulator.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/transport/packets.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/transport/stream-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/transport/transport.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/webconsole/client.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/webconsole/js-property-provider.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/webconsole/network-helper.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/webconsole/network-monitor.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/webconsole/server-logger-monitor.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/webconsole/server-logger.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/webconsole/utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/webconsole/worker-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/worker/helper.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/worker/loader.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/worker/worker.js
+lib/tor-browser/browser/chrome/devtools/skin/animationinspector.css
+lib/tor-browser/browser/chrome/devtools/skin/canvasdebugger.css
+lib/tor-browser/browser/chrome/devtools/skin/commandline.css
+lib/tor-browser/browser/chrome/devtools/skin/common.css
+lib/tor-browser/browser/chrome/devtools/skin/computedview.css
+lib/tor-browser/browser/chrome/devtools/skin/dark-theme.css
+lib/tor-browser/browser/chrome/devtools/skin/debugger.css
+lib/tor-browser/browser/chrome/devtools/skin/eyedropper.css
+lib/tor-browser/browser/chrome/devtools/skin/floating-scrollbars-light.css
+lib/tor-browser/browser/chrome/devtools/skin/floating-scrollbars.css
+lib/tor-browser/browser/chrome/devtools/skin/font-inspector.css
+lib/tor-browser/browser/chrome/devtools/skin/images/add.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/alerticon-warning.png
+lib/tor-browser/browser/chrome/devtools/skin/images/alerticon-warning@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/animation-fast-track.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/arrow-e.png
+lib/tor-browser/browser/chrome/devtools/skin/images/arrow-e@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/breadcrumbs-divider@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/breadcrumbs-scrollbutton.png
+lib/tor-browser/browser/chrome/devtools/skin/images/breadcrumbs-scrollbutton@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/close.png
+lib/tor-browser/browser/chrome/devtools/skin/images/close@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/command-console.png
+lib/tor-browser/browser/chrome/devtools/skin/images/command-console@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/command-eyedropper.png
+lib/tor-browser/browser/chrome/devtools/skin/images/command-eyedropper@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/command-frames.png
+lib/tor-browser/browser/chrome/devtools/skin/images/command-frames@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/command-measure.png
+lib/tor-browser/browser/chrome/devtools/skin/images/command-measure@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/command-paintflashing.png
+lib/tor-browser/browser/chrome/devtools/skin/images/command-paintflashing@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/command-pick.png
+lib/tor-browser/browser/chrome/devtools/skin/images/command-pick@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/command-responsivemode.png
+lib/tor-browser/browser/chrome/devtools/skin/images/command-responsivemode@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/command-rulers.png
+lib/tor-browser/browser/chrome/devtools/skin/images/command-rulers@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/command-scratchpad.png
+lib/tor-browser/browser/chrome/devtools/skin/images/command-scratchpad@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/command-screenshot.png
+lib/tor-browser/browser/chrome/devtools/skin/images/command-screenshot@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/command-tilt.png
+lib/tor-browser/browser/chrome/devtools/skin/images/command-tilt@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/commandline-icon.png
+lib/tor-browser/browser/chrome/devtools/skin/images/commandline-icon@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/controls.png
+lib/tor-browser/browser/chrome/devtools/skin/images/controls@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/cubic-bezier-swatch.png
+lib/tor-browser/browser/chrome/devtools/skin/images/cubic-bezier-swatch@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-blackbox.png
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-blackbox@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-collapse.png
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-collapse@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-expand.png
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-expand@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-pause.png
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-pause@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-play.png
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-play@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-prettyprint.png
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-prettyprint@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-step-in.png
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-step-in@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-step-out.png
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-step-out@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-step-over.png
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-step-over@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-toggleBreakpoints.png
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-toggleBreakpoints@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/debugging-addons.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/debugging-devices.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/debugging-workers.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/dock-bottom-maximize@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/dock-bottom-minimize@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/dock-bottom@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/dock-side@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/dropmarker.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/editor-breakpoint.png
+lib/tor-browser/browser/chrome/devtools/skin/images/editor-breakpoint@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/editor-debug-location.png
+lib/tor-browser/browser/chrome/devtools/skin/images/editor-debug-location@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/editor-error.png
+lib/tor-browser/browser/chrome/devtools/skin/images/fast-forward.png
+lib/tor-browser/browser/chrome/devtools/skin/images/fast-forward@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/filetypes/dir-close.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/filetypes/dir-open.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/filetypes/globe.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/filetypes/store.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/filter-swatch.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/filters.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/itemArrow-dark-ltr.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/itemArrow-dark-rtl.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/itemArrow-ltr.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/itemArrow-rtl.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/itemToggle.png
+lib/tor-browser/browser/chrome/devtools/skin/images/itemToggle@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/magnifying-glass-light.png
+lib/tor-browser/browser/chrome/devtools/skin/images/magnifying-glass-light@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/magnifying-glass.png
+lib/tor-browser/browser/chrome/devtools/skin/images/magnifying-glass@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/noise.png
+lib/tor-browser/browser/chrome/devtools/skin/images/performance-icons.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/power.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/profiler-stopwatch.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/pseudo-class.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/reload.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/responsivemode/responsive-horizontal-resizer.png
+lib/tor-browser/browser/chrome/devtools/skin/images/responsivemode/responsive-horizontal-resizer@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/responsivemode/responsive-se-resizer.png
+lib/tor-browser/browser/chrome/devtools/skin/images/responsivemode/responsive-se-resizer@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/responsivemode/responsive-vertical-resizer.png
+lib/tor-browser/browser/chrome/devtools/skin/images/responsivemode/responsive-vertical-resizer@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/responsivemode/responsiveui-home.png
+lib/tor-browser/browser/chrome/devtools/skin/images/responsivemode/responsiveui-rotate.png
+lib/tor-browser/browser/chrome/devtools/skin/images/responsivemode/responsiveui-rotate@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/responsivemode/responsiveui-screenshot.png
+lib/tor-browser/browser/chrome/devtools/skin/images/responsivemode/responsiveui-screenshot@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/responsivemode/responsiveui-touch.png
+lib/tor-browser/browser/chrome/devtools/skin/images/responsivemode/responsiveui-touch@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/rewind.png
+lib/tor-browser/browser/chrome/devtools/skin/images/rewind@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/search-clear-dark.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/search-clear-failed.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/search-clear-light.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/security-state-broken.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/security-state-insecure.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/security-state-local.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/security-state-secure.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/security-state-weak.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/sort-arrows.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/timeline-filter.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/toggle-tools.png
+lib/tor-browser/browser/chrome/devtools/skin/images/toggle-tools@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/tool-canvas.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/tool-debugger-paused.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/tool-debugger.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/tool-inspector.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/tool-memory-active.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/tool-memory.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/tool-network.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/tool-options.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/tool-profiler-active.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/tool-profiler.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/tool-scratchpad.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/tool-shadereditor.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/tool-storage.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/tool-styleeditor.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/tool-webaudio.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/tool-webconsole.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/tracer-icon.png
+lib/tor-browser/browser/chrome/devtools/skin/images/tracer-icon@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/undock@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/vview-delete.png
+lib/tor-browser/browser/chrome/devtools/skin/images/vview-delete@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/vview-edit.png
+lib/tor-browser/browser/chrome/devtools/skin/images/vview-edit@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/vview-lock.png
+lib/tor-browser/browser/chrome/devtools/skin/images/vview-lock@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/vview-open-inspector.png
+lib/tor-browser/browser/chrome/devtools/skin/images/vview-open-inspector@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/images/webconsole.svg
+lib/tor-browser/browser/chrome/devtools/skin/inspector.css
+lib/tor-browser/browser/chrome/devtools/skin/layoutview.css
+lib/tor-browser/browser/chrome/devtools/skin/light-theme.css
+lib/tor-browser/browser/chrome/devtools/skin/markup-view.css
+lib/tor-browser/browser/chrome/devtools/skin/memory.css
+lib/tor-browser/browser/chrome/devtools/skin/netmonitor.css
+lib/tor-browser/browser/chrome/devtools/skin/performance.css
+lib/tor-browser/browser/chrome/devtools/skin/projecteditor/projecteditor.css
+lib/tor-browser/browser/chrome/devtools/skin/promisedebugger.css
+lib/tor-browser/browser/chrome/devtools/skin/ruleview.css
+lib/tor-browser/browser/chrome/devtools/skin/scratchpad.css
+lib/tor-browser/browser/chrome/devtools/skin/shadereditor.css
+lib/tor-browser/browser/chrome/devtools/skin/splitview.css
+lib/tor-browser/browser/chrome/devtools/skin/storage.css
+lib/tor-browser/browser/chrome/devtools/skin/styleeditor.css
+lib/tor-browser/browser/chrome/devtools/skin/toolbars.css
+lib/tor-browser/browser/chrome/devtools/skin/tooltip/arrow-horizontal-dark.png
+lib/tor-browser/browser/chrome/devtools/skin/tooltip/arrow-horizontal-dark@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/tooltip/arrow-horizontal-light.png
+lib/tor-browser/browser/chrome/devtools/skin/tooltip/arrow-horizontal-light@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/tooltip/arrow-vertical-dark.png
+lib/tor-browser/browser/chrome/devtools/skin/tooltip/arrow-vertical-dark@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/tooltip/arrow-vertical-light.png
+lib/tor-browser/browser/chrome/devtools/skin/tooltip/arrow-vertical-light@2x.png
+lib/tor-browser/browser/chrome/devtools/skin/variables.css
+lib/tor-browser/browser/chrome/devtools/skin/webaudioeditor.css
+lib/tor-browser/browser/chrome/devtools/skin/webconsole.css
+lib/tor-browser/browser/chrome/devtools/skin/widgets.css
lib/tor-browser/browser/chrome/en-US/locale/branding/brand.dtd
lib/tor-browser/browser/chrome/en-US/locale/branding/brand.properties
lib/tor-browser/browser/chrome/en-US/locale/branding/browserconfig.properties
@@ -936,66 +1488,17 @@ lib/tor-browser/browser/chrome/en-US/locale/browser/aboutTabCrashed.dtd
lib/tor-browser/browser/chrome/en-US/locale/browser/accounts.properties
lib/tor-browser/browser/chrome/en-US/locale/browser/appstrings.properties
lib/tor-browser/browser/chrome/en-US/locale/browser/baseMenuOverlay.dtd
+lib/tor-browser/browser/chrome/en-US/locale/browser/browser-pocket.properties
lib/tor-browser/browser/chrome/en-US/locale/browser/browser.dtd
lib/tor-browser/browser/chrome/en-US/locale/browser/browser.properties
lib/tor-browser/browser/chrome/en-US/locale/browser/customizableui/customizableWidgets.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/VariablesView.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/animationinspector.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/animationinspector.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/app-manager.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/app-manager.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/appcacheutils.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/canvasdebugger.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/canvasdebugger.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/connection-screen.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/connection-screen.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/debugger.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/debugger.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/device.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/eyedropper.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/font-inspector.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/gcli.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/gclicommands.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/inspector.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/inspector.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/layoutview.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/netmonitor.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/netmonitor.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/profiler.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/profiler.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/projecteditor.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/responsiveUI.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/scratchpad.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/scratchpad.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/shadereditor.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/shadereditor.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/shared.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/sourceeditor.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/sourceeditor.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/storage.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/styleeditor.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/styleeditor.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/styleinspector.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/tilt.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/timeline.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/timeline.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/toolbox.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/toolbox.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/webConsole.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/webaudioeditor.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/webaudioeditor.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/webconsole.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/webide.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/devtools/webide.properties
lib/tor-browser/browser/chrome/en-US/locale/browser/downloads/downloads.dtd
lib/tor-browser/browser/chrome/en-US/locale/browser/downloads/downloads.properties
lib/tor-browser/browser/chrome/en-US/locale/browser/downloads/settingsChange.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/engineManager.dtd
lib/tor-browser/browser/chrome/en-US/locale/browser/engineManager.properties
lib/tor-browser/browser/chrome/en-US/locale/browser/feeds/subscribe.dtd
lib/tor-browser/browser/chrome/en-US/locale/browser/feeds/subscribe.properties
lib/tor-browser/browser/chrome/en-US/locale/browser/lightweightThemes.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/loop/loop.properties
lib/tor-browser/browser/chrome/en-US/locale/browser/migration/migration.dtd
lib/tor-browser/browser/chrome/en-US/locale/browser/migration/migration.properties
lib/tor-browser/browser/chrome/en-US/locale/browser/netError.dtd
@@ -1008,12 +1511,11 @@ lib/tor-browser/browser/chrome/en-US/locale/browser/places/editBookmarkOverlay.d
lib/tor-browser/browser/chrome/en-US/locale/browser/places/moveBookmarks.dtd
lib/tor-browser/browser/chrome/en-US/locale/browser/places/places.dtd
lib/tor-browser/browser/chrome/en-US/locale/browser/places/places.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/preferences/aboutPermissions.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/preferences/aboutPermissions.properties
lib/tor-browser/browser/chrome/en-US/locale/browser/preferences/advanced.dtd
lib/tor-browser/browser/chrome/en-US/locale/browser/preferences/applicationManager.dtd
lib/tor-browser/browser/chrome/en-US/locale/browser/preferences/applicationManager.properties
lib/tor-browser/browser/chrome/en-US/locale/browser/preferences/applications.dtd
+lib/tor-browser/browser/chrome/en-US/locale/browser/preferences/blocklists.dtd
lib/tor-browser/browser/chrome/en-US/locale/browser/preferences/colors.dtd
lib/tor-browser/browser/chrome/en-US/locale/browser/preferences/connection.dtd
lib/tor-browser/browser/chrome/en-US/locale/browser/preferences/content.dtd
@@ -1038,6 +1540,16 @@ lib/tor-browser/browser/chrome/en-US/locale/browser/safebrowsing/report-phishing
lib/tor-browser/browser/chrome/en-US/locale/browser/sanitize.dtd
lib/tor-browser/browser/chrome/en-US/locale/browser/search.properties
lib/tor-browser/browser/chrome/en-US/locale/browser/searchbar.dtd
+lib/tor-browser/browser/chrome/en-US/locale/browser/searchplugins/ddg-onion.xml
+lib/tor-browser/browser/chrome/en-US/locale/browser/searchplugins/ddg.xml
+lib/tor-browser/browser/chrome/en-US/locale/browser/searchplugins/disconnect.xml
+lib/tor-browser/browser/chrome/en-US/locale/browser/searchplugins/google.xml
+lib/tor-browser/browser/chrome/en-US/locale/browser/searchplugins/list.txt
+lib/tor-browser/browser/chrome/en-US/locale/browser/searchplugins/startpage.xml
+lib/tor-browser/browser/chrome/en-US/locale/browser/searchplugins/twitter.xml
+lib/tor-browser/browser/chrome/en-US/locale/browser/searchplugins/wikipedia.xml
+lib/tor-browser/browser/chrome/en-US/locale/browser/searchplugins/yahoo.xml
+lib/tor-browser/browser/chrome/en-US/locale/browser/searchplugins/youtube.xml
lib/tor-browser/browser/chrome/en-US/locale/browser/setDesktopBackground.dtd
lib/tor-browser/browser/chrome/en-US/locale/browser/shellservice.properties
lib/tor-browser/browser/chrome/en-US/locale/browser/sitePermissions.properties
@@ -1045,27 +1557,82 @@ lib/tor-browser/browser/chrome/en-US/locale/browser/syncBrand.dtd
lib/tor-browser/browser/chrome/en-US/locale/browser/syncCustomize.dtd
lib/tor-browser/browser/chrome/en-US/locale/browser/syncGenericChange.properties
lib/tor-browser/browser/chrome/en-US/locale/browser/syncKey.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/syncProgress.dtd
lib/tor-browser/browser/chrome/en-US/locale/browser/syncQuota.dtd
lib/tor-browser/browser/chrome/en-US/locale/browser/syncQuota.properties
lib/tor-browser/browser/chrome/en-US/locale/browser/syncSetup.dtd
lib/tor-browser/browser/chrome/en-US/locale/browser/syncSetup.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/tabbrowser.dtd
lib/tor-browser/browser/chrome/en-US/locale/browser/tabbrowser.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/tabview.properties
lib/tor-browser/browser/chrome/en-US/locale/browser/taskbar.properties
lib/tor-browser/browser/chrome/en-US/locale/browser/translation.dtd
lib/tor-browser/browser/chrome/en-US/locale/browser/translation.properties
lib/tor-browser/browser/chrome/en-US/locale/browser/webrtcIndicator.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/VariablesView.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/aboutdebugging.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/aboutdebugging.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/animationinspector.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/animationinspector.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/app-manager.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/appcacheutils.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/canvasdebugger.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/canvasdebugger.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/connection-screen.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/connection-screen.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/debugger.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/debugger.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/device.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/eyedropper.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/filterwidget.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/filterwidget.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/font-inspector.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/graphs.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/har.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/inspector.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/inspector.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/jsonview.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/layoutview.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/markers.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/memory.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/netmonitor.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/netmonitor.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/performance.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/performance.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/projecteditor.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/promisedebugger.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/promisedebugger.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/responsiveUI.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/scratchpad.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/scratchpad.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/shadereditor.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/shadereditor.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/shared.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/sourceeditor.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/sourceeditor.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/storage.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/styleeditor.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/styleeditor.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/styleinspector.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/tilt.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/toolbox.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/toolbox.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/webConsole.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/webaudioeditor.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/webaudioeditor.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/webconsole.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/webide.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/webide.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/shared/csscoverage.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/shared/csscoverage.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/shared/debugger.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/shared/gcli.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/shared/gclicommands.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/shared/styleinspector.properties
lib/tor-browser/browser/chrome/en-US/locale/pdfviewer/chrome.properties
lib/tor-browser/browser/chrome/en-US/locale/pdfviewer/viewer.properties
lib/tor-browser/browser/chrome/icons/default/default16.png
lib/tor-browser/browser/chrome/icons/default/default32.png
lib/tor-browser/browser/chrome/icons/default/default48.png
-lib/tor-browser/browser/chrome/pdfjs/LICENSE
lib/tor-browser/browser/chrome/pdfjs/content/PdfJs.jsm
lib/tor-browser/browser/chrome/pdfjs/content/PdfJsTelemetry.jsm
-lib/tor-browser/browser/chrome/pdfjs/content/PdfRedirector.jsm
lib/tor-browser/browser/chrome/pdfjs/content/PdfStreamConverter.jsm
lib/tor-browser/browser/chrome/pdfjs/content/PdfjsChromeUtils.jsm
lib/tor-browser/browser/chrome/pdfjs/content/PdfjsContentUtils.jsm
@@ -1321,11 +1888,16 @@ lib/tor-browser/browser/chrome/pdfjs/content/web/images/toolbarButton-zoomIn.png
lib/tor-browser/browser/chrome/pdfjs/content/web/images/toolbarButton-zoomIn@2x.png
lib/tor-browser/browser/chrome/pdfjs/content/web/images/toolbarButton-zoomOut.png
lib/tor-browser/browser/chrome/pdfjs/content/web/images/toolbarButton-zoomOut@2x.png
+lib/tor-browser/browser/chrome/pdfjs/content/web/images/treeitem-collapsed-rtl.png
+lib/tor-browser/browser/chrome/pdfjs/content/web/images/treeitem-collapsed-rtl@2x.png
+lib/tor-browser/browser/chrome/pdfjs/content/web/images/treeitem-collapsed.png
+lib/tor-browser/browser/chrome/pdfjs/content/web/images/treeitem-collapsed@2x.png
+lib/tor-browser/browser/chrome/pdfjs/content/web/images/treeitem-expanded.png
+lib/tor-browser/browser/chrome/pdfjs/content/web/images/treeitem-expanded@2x.png
lib/tor-browser/browser/chrome/pdfjs/content/web/l10n.js
lib/tor-browser/browser/chrome/pdfjs/content/web/viewer.css
lib/tor-browser/browser/chrome/pdfjs/content/web/viewer.html
lib/tor-browser/browser/chrome/pdfjs/content/web/viewer.js
-lib/tor-browser/browser/chrome/pdfjs/pdfjs.manifest
lib/tor-browser/browser/chrome/webide/content/addons.js
lib/tor-browser/browser/chrome/webide/content/addons.xhtml
lib/tor-browser/browser/chrome/webide/content/details.js
@@ -1344,8 +1916,16 @@ lib/tor-browser/browser/chrome/webide/content/permissionstable.js
lib/tor-browser/browser/chrome/webide/content/permissionstable.xhtml
lib/tor-browser/browser/chrome/webide/content/prefs.js
lib/tor-browser/browser/chrome/webide/content/prefs.xhtml
+lib/tor-browser/browser/chrome/webide/content/project-listing.js
+lib/tor-browser/browser/chrome/webide/content/project-listing.xhtml
+lib/tor-browser/browser/chrome/webide/content/project-panel.js
+lib/tor-browser/browser/chrome/webide/content/runtime-listing.js
+lib/tor-browser/browser/chrome/webide/content/runtime-listing.xhtml
+lib/tor-browser/browser/chrome/webide/content/runtime-panel.js
lib/tor-browser/browser/chrome/webide/content/runtimedetails.js
lib/tor-browser/browser/chrome/webide/content/runtimedetails.xhtml
+lib/tor-browser/browser/chrome/webide/content/simulator.js
+lib/tor-browser/browser/chrome/webide/content/simulator.xhtml
lib/tor-browser/browser/chrome/webide/content/webide.js
lib/tor-browser/browser/chrome/webide/content/webide.xul
lib/tor-browser/browser/chrome/webide/content/wifi-auth.js
@@ -1353,14 +1933,18 @@ lib/tor-browser/browser/chrome/webide/content/wifi-auth.xhtml
lib/tor-browser/browser/chrome/webide/skin/addons.css
lib/tor-browser/browser/chrome/webide/skin/config-view.css
lib/tor-browser/browser/chrome/webide/skin/deck.css
+lib/tor-browser/browser/chrome/webide/skin/default-app-icon.png
lib/tor-browser/browser/chrome/webide/skin/details.css
lib/tor-browser/browser/chrome/webide/skin/icons.png
lib/tor-browser/browser/chrome/webide/skin/logs.css
lib/tor-browser/browser/chrome/webide/skin/monitor.css
lib/tor-browser/browser/chrome/webide/skin/newapp.css
+lib/tor-browser/browser/chrome/webide/skin/noise.png
+lib/tor-browser/browser/chrome/webide/skin/panel-listing.css
lib/tor-browser/browser/chrome/webide/skin/permissionstable.css
-lib/tor-browser/browser/chrome/webide/skin/prefs.css
+lib/tor-browser/browser/chrome/webide/skin/rocket.svg
lib/tor-browser/browser/chrome/webide/skin/runtimedetails.css
+lib/tor-browser/browser/chrome/webide/skin/simulator.css
lib/tor-browser/browser/chrome/webide/skin/throbber.svg
lib/tor-browser/browser/chrome/webide/skin/webide.css
lib/tor-browser/browser/chrome/webide/skin/wifi-auth.css
@@ -1383,7 +1967,9 @@ lib/tor-browser/browser/components/nsSessionStartup.js
lib/tor-browser/browser/components/nsSessionStore.js
lib/tor-browser/browser/components/nsSetDefaultBrowser.js
lib/tor-browser/browser/components/webideCli.js
+lib/tor-browser/browser/defaults/permissions
lib/tor-browser/browser/defaults/preferences/000-tor-browser.js
+lib/tor-browser/browser/defaults/preferences/devtools.js
lib/tor-browser/browser/defaults/preferences/firefox-branding.js
lib/tor-browser/browser/defaults/preferences/firefox-l10n.js
lib/tor-browser/browser/defaults/preferences/firefox.js
@@ -1394,14 +1980,17 @@ lib/tor-browser/browser/defaults/profile/chrome/userContent-example.css
lib/tor-browser/browser/defaults/profile/localstore.rdf
lib/tor-browser/browser/defaults/profile/mimeTypes.rdf
lib/tor-browser/browser/defaults/profile/prefs.js
+lib/tor-browser/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
lib/tor-browser/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
lib/tor-browser/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
lib/tor-browser/browser/icons/mozicon128.png
lib/tor-browser/browser/modules/AboutHome.jsm
+lib/tor-browser/browser/modules/AboutNewTab.jsm
lib/tor-browser/browser/modules/BrowserUITelemetry.jsm
lib/tor-browser/browser/modules/CastingApps.jsm
lib/tor-browser/browser/modules/Chat.jsm
lib/tor-browser/browser/modules/ContentClick.jsm
+lib/tor-browser/browser/modules/ContentCrashHandlers.jsm
lib/tor-browser/browser/modules/ContentLinkHandler.jsm
lib/tor-browser/browser/modules/ContentObservers.jsm
lib/tor-browser/browser/modules/ContentSearch.jsm
@@ -1412,7 +2001,6 @@ lib/tor-browser/browser/modules/CustomizationTabPreloader.jsm
lib/tor-browser/browser/modules/CustomizeMode.jsm
lib/tor-browser/browser/modules/DirectoryLinksProvider.jsm
lib/tor-browser/browser/modules/DownloadsCommon.jsm
-lib/tor-browser/browser/modules/DownloadsLogger.jsm
lib/tor-browser/browser/modules/DownloadsTaskbar.jsm
lib/tor-browser/browser/modules/DownloadsViewUI.jsm
lib/tor-browser/browser/modules/DragPositionManager.jsm
@@ -1423,10 +2011,12 @@ lib/tor-browser/browser/modules/FormValidationHandler.jsm
lib/tor-browser/browser/modules/HiddenFrame.jsm
lib/tor-browser/browser/modules/MigrationUtils.jsm
lib/tor-browser/browser/modules/NetworkPrioritizer.jsm
+lib/tor-browser/browser/modules/NewTabURL.jsm
lib/tor-browser/browser/modules/PanelFrame.jsm
lib/tor-browser/browser/modules/PanelWideWidgetTracker.jsm
lib/tor-browser/browser/modules/PlacesUIUtils.jsm
lib/tor-browser/browser/modules/PluginContent.jsm
+lib/tor-browser/browser/modules/Pocket.jsm
lib/tor-browser/browser/modules/ProcessHangMonitor.jsm
lib/tor-browser/browser/modules/ReaderParent.jsm
lib/tor-browser/browser/modules/RecentWindow.jsm
@@ -1435,182 +2025,15 @@ lib/tor-browser/browser/modules/ScrollbarSampler.jsm
lib/tor-browser/browser/modules/SelfSupportBackend.jsm
lib/tor-browser/browser/modules/SitePermissions.jsm
lib/tor-browser/browser/modules/Social.jsm
-lib/tor-browser/browser/modules/TabCrashReporter.jsm
+lib/tor-browser/browser/modules/TabGroupsMigrator.jsm
+lib/tor-browser/browser/modules/TransientPrefs.jsm
lib/tor-browser/browser/modules/UITour.jsm
lib/tor-browser/browser/modules/WebappManager.jsm
-lib/tor-browser/browser/modules/devtools/AbstractTreeItem.jsm
-lib/tor-browser/browser/modules/devtools/AppCacheUtils.jsm
-lib/tor-browser/browser/modules/devtools/BreadcrumbsWidget.jsm
-lib/tor-browser/browser/modules/devtools/Chart.jsm
-lib/tor-browser/browser/modules/devtools/Curl.jsm
-lib/tor-browser/browser/modules/devtools/DOMHelpers.jsm
-lib/tor-browser/browser/modules/devtools/DeveloperToolbar.jsm
-lib/tor-browser/browser/modules/devtools/FlameGraph.jsm
-lib/tor-browser/browser/modules/devtools/Graphs.jsm
-lib/tor-browser/browser/modules/devtools/GraphsWorker.js
-lib/tor-browser/browser/modules/devtools/Jsbeautify.jsm
-lib/tor-browser/browser/modules/devtools/Parser.jsm
-lib/tor-browser/browser/modules/devtools/SideMenuWidget.jsm
-lib/tor-browser/browser/modules/devtools/SimpleListWidget.jsm
-lib/tor-browser/browser/modules/devtools/SplitView.jsm
-lib/tor-browser/browser/modules/devtools/StyleEditorUI.jsm
-lib/tor-browser/browser/modules/devtools/StyleEditorUtil.jsm
-lib/tor-browser/browser/modules/devtools/StyleSheetEditor.jsm
-lib/tor-browser/browser/modules/devtools/ToolboxProcess.jsm
-lib/tor-browser/browser/modules/devtools/VariablesView.jsm
-lib/tor-browser/browser/modules/devtools/VariablesViewController.jsm
-lib/tor-browser/browser/modules/devtools/ViewHelpers.jsm
-lib/tor-browser/browser/modules/devtools/app-manager/app-projects.js
-lib/tor-browser/browser/modules/devtools/app-manager/app-validator.js
-lib/tor-browser/browser/modules/devtools/app-manager/builtin-adb-store.js
-lib/tor-browser/browser/modules/devtools/app-manager/connection-store.js
-lib/tor-browser/browser/modules/devtools/app-manager/device-store.js
-lib/tor-browser/browser/modules/devtools/app-manager/simulators-store.js
-lib/tor-browser/browser/modules/devtools/app-manager/webapps-store.js
-lib/tor-browser/browser/modules/devtools/canvasdebugger/panel.js
-lib/tor-browser/browser/modules/devtools/commandline/commands-index.js
-lib/tor-browser/browser/modules/devtools/debugger/debugger-commands.js
-lib/tor-browser/browser/modules/devtools/debugger/panel.js
-lib/tor-browser/browser/modules/devtools/eyedropper/commands.js
-lib/tor-browser/browser/modules/devtools/eyedropper/eyedropper-child.js
-lib/tor-browser/browser/modules/devtools/eyedropper/eyedropper.js
-lib/tor-browser/browser/modules/devtools/framework/selection.js
-lib/tor-browser/browser/modules/devtools/framework/sidebar.js
-lib/tor-browser/browser/modules/devtools/framework/target.js
-lib/tor-browser/browser/modules/devtools/framework/toolbox-highlighter-utils.js
-lib/tor-browser/browser/modules/devtools/framework/toolbox-hosts.js
-lib/tor-browser/browser/modules/devtools/framework/toolbox-options.js
-lib/tor-browser/browser/modules/devtools/framework/toolbox.js
+lib/tor-browser/browser/modules/devtools/client/framework/gDevTools.jsm
lib/tor-browser/browser/modules/devtools/gDevTools.jsm
-lib/tor-browser/browser/modules/devtools/inspector/breadcrumbs.js
-lib/tor-browser/browser/modules/devtools/inspector/inspector-commands.js
-lib/tor-browser/browser/modules/devtools/inspector/inspector-panel.js
-lib/tor-browser/browser/modules/devtools/inspector/selector-search.js
-lib/tor-browser/browser/modules/devtools/main.js
-lib/tor-browser/browser/modules/devtools/markupview/html-editor.js
-lib/tor-browser/browser/modules/devtools/markupview/markup-view.js
-lib/tor-browser/browser/modules/devtools/netmonitor/panel.js
-lib/tor-browser/browser/modules/devtools/profiler/panel.js
-lib/tor-browser/browser/modules/devtools/profiler/shared.js
-lib/tor-browser/browser/modules/devtools/projecteditor/editors.js
-lib/tor-browser/browser/modules/devtools/projecteditor/helpers/event.js
-lib/tor-browser/browser/modules/devtools/projecteditor/helpers/file-picker.js
-lib/tor-browser/browser/modules/devtools/projecteditor/helpers/l10n.js
-lib/tor-browser/browser/modules/devtools/projecteditor/helpers/promise.js
-lib/tor-browser/browser/modules/devtools/projecteditor/helpers/prompts.js
-lib/tor-browser/browser/modules/devtools/projecteditor/helpers/readdir.js
-lib/tor-browser/browser/modules/devtools/projecteditor/plugins/app-manager/app-project-editor.js
-lib/tor-browser/browser/modules/devtools/projecteditor/plugins/app-manager/plugin.js
-lib/tor-browser/browser/modules/devtools/projecteditor/plugins/core.js
-lib/tor-browser/browser/modules/devtools/projecteditor/plugins/delete/delete.js
-lib/tor-browser/browser/modules/devtools/projecteditor/plugins/dirty/dirty.js
-lib/tor-browser/browser/modules/devtools/projecteditor/plugins/image-view/image-editor.js
-lib/tor-browser/browser/modules/devtools/projecteditor/plugins/image-view/plugin.js
-lib/tor-browser/browser/modules/devtools/projecteditor/plugins/logging/logging.js
-lib/tor-browser/browser/modules/devtools/projecteditor/plugins/new/new.js
-lib/tor-browser/browser/modules/devtools/projecteditor/plugins/rename/rename.js
-lib/tor-browser/browser/modules/devtools/projecteditor/plugins/save/save.js
-lib/tor-browser/browser/modules/devtools/projecteditor/plugins/status-bar/plugin.js
-lib/tor-browser/browser/modules/devtools/projecteditor/project.js
-lib/tor-browser/browser/modules/devtools/projecteditor/projecteditor.js
-lib/tor-browser/browser/modules/devtools/projecteditor/shells.js
-lib/tor-browser/browser/modules/devtools/projecteditor/stores/base.js
-lib/tor-browser/browser/modules/devtools/projecteditor/stores/local.js
-lib/tor-browser/browser/modules/devtools/projecteditor/stores/resource.js
-lib/tor-browser/browser/modules/devtools/projecteditor/tree.js
-lib/tor-browser/browser/modules/devtools/resize-commands.js
-lib/tor-browser/browser/modules/devtools/responsivedesign-child.js
-lib/tor-browser/browser/modules/devtools/responsivedesign.jsm
-lib/tor-browser/browser/modules/devtools/scratchpad-manager.jsm
-lib/tor-browser/browser/modules/devtools/scratchpad/scratchpad-commands.js
-lib/tor-browser/browser/modules/devtools/scratchpad/scratchpad-panel.js
-lib/tor-browser/browser/modules/devtools/shadereditor/panel.js
-lib/tor-browser/browser/modules/devtools/shared/autocomplete-popup.js
-lib/tor-browser/browser/modules/devtools/shared/d3.js
-lib/tor-browser/browser/modules/devtools/shared/devices.js
-lib/tor-browser/browser/modules/devtools/shared/doorhanger.js
-lib/tor-browser/browser/modules/devtools/shared/frame-script-utils.js
-lib/tor-browser/browser/modules/devtools/shared/inplace-editor.js
-lib/tor-browser/browser/modules/devtools/shared/observable-object.js
-lib/tor-browser/browser/modules/devtools/shared/options-view.js
-lib/tor-browser/browser/modules/devtools/shared/profiler/global.js
-lib/tor-browser/browser/modules/devtools/shared/profiler/tree-model.js
-lib/tor-browser/browser/modules/devtools/shared/profiler/tree-view.js
-lib/tor-browser/browser/modules/devtools/shared/telemetry.js
-lib/tor-browser/browser/modules/devtools/shared/theme-switching.js
-lib/tor-browser/browser/modules/devtools/shared/theme.js
-lib/tor-browser/browser/modules/devtools/shared/timeline/global.js
-lib/tor-browser/browser/modules/devtools/shared/timeline/marker-details.js
-lib/tor-browser/browser/modules/devtools/shared/timeline/markers-overview.js
-lib/tor-browser/browser/modules/devtools/shared/timeline/memory-overview.js
-lib/tor-browser/browser/modules/devtools/shared/timeline/waterfall.js
-lib/tor-browser/browser/modules/devtools/shared/undo.js
-lib/tor-browser/browser/modules/devtools/shared/widgets/CubicBezierWidget.js
-lib/tor-browser/browser/modules/devtools/shared/widgets/FastListWidget.js
-lib/tor-browser/browser/modules/devtools/shared/widgets/Spectrum.js
-lib/tor-browser/browser/modules/devtools/shared/widgets/TableWidget.js
-lib/tor-browser/browser/modules/devtools/shared/widgets/Tooltip.js
-lib/tor-browser/browser/modules/devtools/shared/widgets/TreeWidget.js
-lib/tor-browser/browser/modules/devtools/sourceeditor/autocomplete.js
-lib/tor-browser/browser/modules/devtools/sourceeditor/css-autocompleter.js
-lib/tor-browser/browser/modules/devtools/sourceeditor/css-tokenizer.js
-lib/tor-browser/browser/modules/devtools/sourceeditor/debugger.js
-lib/tor-browser/browser/modules/devtools/sourceeditor/editor.js
-lib/tor-browser/browser/modules/devtools/storage/panel.js
-lib/tor-browser/browser/modules/devtools/storage/ui.js
-lib/tor-browser/browser/modules/devtools/styleeditor/styleeditor-commands.js
-lib/tor-browser/browser/modules/devtools/styleeditor/styleeditor-panel.js
-lib/tor-browser/browser/modules/devtools/styleeditor/utils.js
-lib/tor-browser/browser/modules/devtools/styleinspector/computed-view.js
-lib/tor-browser/browser/modules/devtools/styleinspector/css-parsing-utils.js
-lib/tor-browser/browser/modules/devtools/styleinspector/rule-view.js
-lib/tor-browser/browser/modules/devtools/styleinspector/style-inspector-overlays.js
-lib/tor-browser/browser/modules/devtools/styleinspector/style-inspector.js
-lib/tor-browser/browser/modules/devtools/tilt/TiltWorkerCrafter.js
-lib/tor-browser/browser/modules/devtools/tilt/TiltWorkerPicker.js
-lib/tor-browser/browser/modules/devtools/tilt/tilt-commands.js
-lib/tor-browser/browser/modules/devtools/tilt/tilt-gl.js
-lib/tor-browser/browser/modules/devtools/tilt/tilt-math.js
-lib/tor-browser/browser/modules/devtools/tilt/tilt-utils.js
-lib/tor-browser/browser/modules/devtools/tilt/tilt-visualizer-style.js
-lib/tor-browser/browser/modules/devtools/tilt/tilt-visualizer.js
-lib/tor-browser/browser/modules/devtools/tilt/tilt.js
-lib/tor-browser/browser/modules/devtools/timeline/panel.js
-lib/tor-browser/browser/modules/devtools/webaudioeditor/panel.js
-lib/tor-browser/browser/modules/devtools/webconsole/console-commands.js
-lib/tor-browser/browser/modules/devtools/webconsole/console-output.js
-lib/tor-browser/browser/modules/devtools/webconsole/hudservice.js
-lib/tor-browser/browser/modules/devtools/webconsole/network-panel.js
-lib/tor-browser/browser/modules/devtools/webconsole/panel.js
-lib/tor-browser/browser/modules/devtools/webconsole/webconsole.js
-lib/tor-browser/browser/modules/devtools/webide/addons.js
-lib/tor-browser/browser/modules/devtools/webide/app-manager.js
-lib/tor-browser/browser/modules/devtools/webide/build.js
-lib/tor-browser/browser/modules/devtools/webide/config-view.js
-lib/tor-browser/browser/modules/devtools/webide/remote-resources.js
-lib/tor-browser/browser/modules/devtools/webide/runtimes.js
-lib/tor-browser/browser/modules/devtools/webide/simulator-process.js
-lib/tor-browser/browser/modules/devtools/webide/simulators.js
-lib/tor-browser/browser/modules/devtools/webide/tab-store.js
-lib/tor-browser/browser/modules/devtools/webide/utils.js
lib/tor-browser/browser/modules/distribution.js
lib/tor-browser/browser/modules/experiments/Experiments.jsm
-lib/tor-browser/browser/modules/loop/CardDavImporter.jsm
-lib/tor-browser/browser/modules/loop/GoogleImporter.jsm
-lib/tor-browser/browser/modules/loop/LoopCalls.jsm
-lib/tor-browser/browser/modules/loop/LoopContacts.jsm
-lib/tor-browser/browser/modules/loop/LoopRooms.jsm
-lib/tor-browser/browser/modules/loop/LoopStorage.jsm
-lib/tor-browser/browser/modules/loop/MozLoopAPI.jsm
-lib/tor-browser/browser/modules/loop/MozLoopPushHandler.jsm
-lib/tor-browser/browser/modules/loop/MozLoopService.jsm
-lib/tor-browser/browser/modules/loop/MozLoopWorker.js
lib/tor-browser/browser/modules/offlineAppCache.jsm
-lib/tor-browser/browser/modules/readinglist/ReadingList.jsm
-lib/tor-browser/browser/modules/readinglist/SQLiteStore.jsm
-lib/tor-browser/browser/modules/readinglist/Scheduler.jsm
-lib/tor-browser/browser/modules/readinglist/ServerClient.jsm
-lib/tor-browser/browser/modules/readinglist/Sync.jsm
lib/tor-browser/browser/modules/sessionstore/ContentRestore.jsm
lib/tor-browser/browser/modules/sessionstore/DocShellCapabilities.jsm
lib/tor-browser/browser/modules/sessionstore/FrameTree.jsm
@@ -1629,31 +2052,25 @@ lib/tor-browser/browser/modules/sessionstore/SessionStorage.jsm
lib/tor-browser/browser/modules/sessionstore/SessionStore.jsm
lib/tor-browser/browser/modules/sessionstore/SessionWorker.js
lib/tor-browser/browser/modules/sessionstore/SessionWorker.jsm
+lib/tor-browser/browser/modules/sessionstore/StartupPerformance.jsm
lib/tor-browser/browser/modules/sessionstore/TabAttributes.jsm
lib/tor-browser/browser/modules/sessionstore/TabState.jsm
lib/tor-browser/browser/modules/sessionstore/TabStateCache.jsm
+lib/tor-browser/browser/modules/sessionstore/TabStateFlusher.jsm
lib/tor-browser/browser/modules/sessionstore/Utils.jsm
-lib/tor-browser/browser/modules/tabview/utils.jsm
lib/tor-browser/browser/modules/translation/BingTranslator.jsm
lib/tor-browser/browser/modules/translation/LanguageDetector.jsm
lib/tor-browser/browser/modules/translation/Translation.jsm
lib/tor-browser/browser/modules/translation/TranslationContentHandler.jsm
lib/tor-browser/browser/modules/translation/TranslationDocument.jsm
+lib/tor-browser/browser/modules/translation/YandexTranslator.jsm
lib/tor-browser/browser/modules/translation/cld-worker.js
lib/tor-browser/browser/modules/translation/cld-worker.js.mem
lib/tor-browser/browser/modules/webrtcUI.jsm
-lib/tor-browser/browser/searchplugins/ddg.xml
-lib/tor-browser/browser/searchplugins/disconnect.xml
-lib/tor-browser/browser/searchplugins/google.xml
-lib/tor-browser/browser/searchplugins/startpage.xml
-lib/tor-browser/browser/searchplugins/twitter.xml
-lib/tor-browser/browser/searchplugins/wikipedia.xml
-lib/tor-browser/browser/searchplugins/yahoo.xml
-lib/tor-browser/browser/searchplugins/youtube.xml
lib/tor-browser/chrome.manifest
lib/tor-browser/chrome/chrome.manifest
lib/tor-browser/chrome/en-US/locale/en-US/alerts/alert.dtd
-lib/tor-browser/chrome/en-US/locale/en-US/alerts/notificationNames.properties
+lib/tor-browser/chrome/en-US/locale/en-US/alerts/alert.properties
lib/tor-browser/chrome/en-US/locale/en-US/autoconfig/autoconfig.properties
lib/tor-browser/chrome/en-US/locale/en-US/cookie/cookieAcceptDialog.dtd
lib/tor-browser/chrome/en-US/locale/en-US/cookie/cookieAcceptDialog.properties
@@ -1674,10 +2091,13 @@ lib/tor-browser/chrome/en-US/locale/en-US/global/aboutAbout.dtd
lib/tor-browser/chrome/en-US/locale/en-US/global/aboutNetworking.dtd
lib/tor-browser/chrome/en-US/locale/en-US/global/aboutReader.properties
lib/tor-browser/chrome/en-US/locale/en-US/global/aboutRights.dtd
+lib/tor-browser/chrome/en-US/locale/en-US/global/aboutServiceWorkers.dtd
+lib/tor-browser/chrome/en-US/locale/en-US/global/aboutServiceWorkers.properties
lib/tor-browser/chrome/en-US/locale/en-US/global/aboutSupport.dtd
lib/tor-browser/chrome/en-US/locale/en-US/global/aboutSupport.properties
lib/tor-browser/chrome/en-US/locale/en-US/global/aboutTelemetry.dtd
lib/tor-browser/chrome/en-US/locale/en-US/global/aboutTelemetry.properties
+lib/tor-browser/chrome/en-US/locale/en-US/global/aboutWebrtc.properties
lib/tor-browser/chrome/en-US/locale/en-US/global/appPicker.dtd
lib/tor-browser/chrome/en-US/locale/en-US/global/appstrings.properties
lib/tor-browser/chrome/en-US/locale/en-US/global/autocomplete.properties
@@ -1699,10 +2119,6 @@ lib/tor-browser/chrome/en-US/locale/en-US/global/customizeToolbar.dtd
lib/tor-browser/chrome/en-US/locale/en-US/global/customizeToolbar.properties
lib/tor-browser/chrome/en-US/locale/en-US/global/dateFormat.properties
lib/tor-browser/chrome/en-US/locale/en-US/global/datetimepicker.dtd
-lib/tor-browser/chrome/en-US/locale/en-US/global/devtools/csscoverage.dtd
-lib/tor-browser/chrome/en-US/locale/en-US/global/devtools/csscoverage.properties
-lib/tor-browser/chrome/en-US/locale/en-US/global/devtools/debugger.properties
-lib/tor-browser/chrome/en-US/locale/en-US/global/devtools/styleinspector.properties
lib/tor-browser/chrome/en-US/locale/en-US/global/dialog.properties
lib/tor-browser/chrome/en-US/locale/en-US/global/dialogOverlay.dtd
lib/tor-browser/chrome/en-US/locale/en-US/global/dom/dom.properties
@@ -1781,7 +2197,6 @@ lib/tor-browser/chrome/en-US/locale/en-US/mozapps/extensions/update.dtd
lib/tor-browser/chrome/en-US/locale/en-US/mozapps/extensions/update.properties
lib/tor-browser/chrome/en-US/locale/en-US/mozapps/handling/handling.dtd
lib/tor-browser/chrome/en-US/locale/en-US/mozapps/handling/handling.properties
-lib/tor-browser/chrome/en-US/locale/en-US/mozapps/plugins/plugins.dtd
lib/tor-browser/chrome/en-US/locale/en-US/mozapps/preferences/changemp.dtd
lib/tor-browser/chrome/en-US/locale/en-US/mozapps/preferences/preferences.properties
lib/tor-browser/chrome/en-US/locale/en-US/mozapps/preferences/removemp.dtd
@@ -1803,29 +2218,40 @@ lib/tor-browser/chrome/en-US/locale/en-US/pippki/deviceManager.dtd
lib/tor-browser/chrome/en-US/locale/en-US/pippki/pippki.dtd
lib/tor-browser/chrome/en-US/locale/en-US/pippki/pippki.properties
lib/tor-browser/chrome/en-US/locale/en-US/places/places.properties
+lib/tor-browser/chrome/en-US/locale/en-US/pluginproblem/pluginproblem.dtd
lib/tor-browser/chrome/en-US/locale/en-US/services/errors.properties
lib/tor-browser/chrome/en-US/locale/en-US/services/sync.properties
+lib/tor-browser/chrome/marionette/content/Assert.jsm
lib/tor-browser/chrome/marionette/content/ChromePowers.js
lib/tor-browser/chrome/marionette/content/ChromeUtils.js
lib/tor-browser/chrome/marionette/content/EventUtils.js
+lib/tor-browser/chrome/marionette/content/MockColorPicker.jsm
+lib/tor-browser/chrome/marionette/content/MockFilePicker.jsm
+lib/tor-browser/chrome/marionette/content/MockPaymentsUIGlue.jsm
+lib/tor-browser/chrome/marionette/content/MockPermissionPrompt.jsm
lib/tor-browser/chrome/marionette/content/MozillaLogger.js
-lib/tor-browser/chrome/marionette/content/SpecialPowersObserver.js
+lib/tor-browser/chrome/marionette/content/SpecialPowersObserver.jsm
lib/tor-browser/chrome/marionette/content/SpecialPowersObserverAPI.js
+lib/tor-browser/chrome/marionette/content/actions.js
lib/tor-browser/chrome/marionette/content/atoms.js
-lib/tor-browser/chrome/marionette/content/marionette-common.js
-lib/tor-browser/chrome/marionette/content/marionette-elements.js
-lib/tor-browser/chrome/marionette/content/marionette-frame-manager.js
-lib/tor-browser/chrome/marionette/content/marionette-listener.js
-lib/tor-browser/chrome/marionette/content/marionette-sendkeys.js
-lib/tor-browser/chrome/marionette/content/marionette-server.js
-lib/tor-browser/chrome/marionette/content/marionette-simpletest.js
+lib/tor-browser/chrome/marionette/content/capture.js
+lib/tor-browser/chrome/marionette/content/common.js
+lib/tor-browser/chrome/marionette/content/cookies.js
+lib/tor-browser/chrome/marionette/content/dispatcher.js
+lib/tor-browser/chrome/marionette/content/driver.js
+lib/tor-browser/chrome/marionette/content/elements.js
+lib/tor-browser/chrome/marionette/content/emulator.js
+lib/tor-browser/chrome/marionette/content/error.js
+lib/tor-browser/chrome/marionette/content/frame-manager.js
+lib/tor-browser/chrome/marionette/content/listener.js
+lib/tor-browser/chrome/marionette/content/message.js
+lib/tor-browser/chrome/marionette/content/modal.js
+lib/tor-browser/chrome/marionette/content/proxy.js
+lib/tor-browser/chrome/marionette/content/sendkeys.js
+lib/tor-browser/chrome/marionette/content/server.js
+lib/tor-browser/chrome/marionette/content/simpletest.js
lib/tor-browser/chrome/marionette/content/specialpowers.js
lib/tor-browser/chrome/marionette/content/specialpowersAPI.js
-lib/tor-browser/chrome/marionette/modules/Assert.jsm
-lib/tor-browser/chrome/marionette/modules/MockColorPicker.jsm
-lib/tor-browser/chrome/marionette/modules/MockFilePicker.jsm
-lib/tor-browser/chrome/marionette/modules/MockPaymentsUIGlue.jsm
-lib/tor-browser/chrome/marionette/modules/MockPermissionPrompt.jsm
lib/tor-browser/chrome/pippki/content/pippki/CAOverlay.xul
lib/tor-browser/chrome/pippki/content/pippki/MineOverlay.xul
lib/tor-browser/chrome/pippki/content/pippki/OrphanOverlay.xul
@@ -1852,12 +2278,8 @@ lib/tor-browser/chrome/pippki/content/pippki/downloadcert.js
lib/tor-browser/chrome/pippki/content/pippki/downloadcert.xul
lib/tor-browser/chrome/pippki/content/pippki/editcacert.xul
lib/tor-browser/chrome/pippki/content/pippki/editcerts.js
-lib/tor-browser/chrome/pippki/content/pippki/editemailcert.xul
-lib/tor-browser/chrome/pippki/content/pippki/escrowWarn.js
-lib/tor-browser/chrome/pippki/content/pippki/escrowWarn.xul
lib/tor-browser/chrome/pippki/content/pippki/exceptionDialog.js
lib/tor-browser/chrome/pippki/content/pippki/exceptionDialog.xul
-lib/tor-browser/chrome/pippki/content/pippki/getpassword.xul
lib/tor-browser/chrome/pippki/content/pippki/load_device.xul
lib/tor-browser/chrome/pippki/content/pippki/password.js
lib/tor-browser/chrome/pippki/content/pippki/pippki.js
@@ -1872,26 +2294,48 @@ lib/tor-browser/chrome/recording/content/recording.js
lib/tor-browser/chrome/recording/content/recording.xul
lib/tor-browser/chrome/toolkit/content/cookie/cookieAcceptDialog.js
lib/tor-browser/chrome/toolkit/content/cookie/cookieAcceptDialog.xul
+lib/tor-browser/chrome/toolkit/content/extensions/ext-alarms.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-backgroundPage.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-cookies.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-extension.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-i18n.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-idle.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-notifications.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-runtime.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-storage.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-test.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-webNavigation.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-webRequest.js
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/cookies.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/extension_types.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/web_navigation.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/web_request.json
lib/tor-browser/chrome/toolkit/content/formautofill/requestAutocomplete.js
lib/tor-browser/chrome/toolkit/content/formautofill/requestAutocomplete.xhtml
+lib/tor-browser/chrome/toolkit/content/gfxsanity/gfxFrameScript.js
+lib/tor-browser/chrome/toolkit/content/gfxsanity/sanityparent.html
+lib/tor-browser/chrome/toolkit/content/gfxsanity/sanitytest.html
+lib/tor-browser/chrome/toolkit/content/gfxsanity/videotest.mp4
lib/tor-browser/chrome/toolkit/content/global/BrowserElementChild.js
lib/tor-browser/chrome/toolkit/content/global/BrowserElementChildPreload.js
+lib/tor-browser/chrome/toolkit/content/global/BrowserElementCopyPaste.js
lib/tor-browser/chrome/toolkit/content/global/BrowserElementPanning.js
+lib/tor-browser/chrome/toolkit/content/global/BrowserElementPanningAPZDisabled.js
+lib/tor-browser/chrome/toolkit/content/global/TopLevelVideoDocument.js
lib/tor-browser/chrome/toolkit/content/global/XPCNativeWrapper.js
lib/tor-browser/chrome/toolkit/content/global/about.js
lib/tor-browser/chrome/toolkit/content/global/about.xhtml
lib/tor-browser/chrome/toolkit/content/global/aboutAbout.js
lib/tor-browser/chrome/toolkit/content/global/aboutAbout.xhtml
lib/tor-browser/chrome/toolkit/content/global/aboutCache.js
-lib/tor-browser/chrome/toolkit/content/global/aboutCompartments.js
-lib/tor-browser/chrome/toolkit/content/global/aboutCompartments.xhtml
lib/tor-browser/chrome/toolkit/content/global/aboutMemory.css
lib/tor-browser/chrome/toolkit/content/global/aboutMemory.js
lib/tor-browser/chrome/toolkit/content/global/aboutMemory.xhtml
lib/tor-browser/chrome/toolkit/content/global/aboutNetworking.js
lib/tor-browser/chrome/toolkit/content/global/aboutNetworking.xhtml
-lib/tor-browser/chrome/toolkit/content/global/aboutRights-unbranded.xhtml
lib/tor-browser/chrome/toolkit/content/global/aboutRights.xhtml
+lib/tor-browser/chrome/toolkit/content/global/aboutServiceWorkers.js
+lib/tor-browser/chrome/toolkit/content/global/aboutServiceWorkers.xhtml
lib/tor-browser/chrome/toolkit/content/global/aboutSupport.js
lib/tor-browser/chrome/toolkit/content/global/aboutSupport.xhtml
lib/tor-browser/chrome/toolkit/content/global/aboutTelemetry.css
@@ -1974,6 +2418,7 @@ lib/tor-browser/chrome/toolkit/content/global/dialogOverlay.xul
lib/tor-browser/chrome/toolkit/content/global/directionDetector.html
lib/tor-browser/chrome/toolkit/content/global/editMenuOverlay.js
lib/tor-browser/chrome/toolkit/content/global/editMenuOverlay.xul
+lib/tor-browser/chrome/toolkit/content/global/extensions.js
lib/tor-browser/chrome/toolkit/content/global/filepicker.js
lib/tor-browser/chrome/toolkit/content/global/filepicker.properties
lib/tor-browser/chrome/toolkit/content/global/filepicker.xul
@@ -1985,6 +2430,7 @@ lib/tor-browser/chrome/toolkit/content/global/globalOverlay.js
lib/tor-browser/chrome/toolkit/content/global/globalOverlay.xul
lib/tor-browser/chrome/toolkit/content/global/inlineSpellCheckUI.js
lib/tor-browser/chrome/toolkit/content/global/license.html
+lib/tor-browser/chrome/toolkit/content/global/manifestMessages.js
lib/tor-browser/chrome/toolkit/content/global/menulist.css
lib/tor-browser/chrome/toolkit/content/global/minimal-xul.css
lib/tor-browser/chrome/toolkit/content/global/mozilla.xhtml
@@ -1996,7 +2442,6 @@ lib/tor-browser/chrome/toolkit/content/global/nsUserSettings.js
lib/tor-browser/chrome/toolkit/content/global/platformHTMLBindings.xml
lib/tor-browser/chrome/toolkit/content/global/plugins.css
lib/tor-browser/chrome/toolkit/content/global/plugins.html
-lib/tor-browser/chrome/toolkit/content/global/post-fork-preload.js
lib/tor-browser/chrome/toolkit/content/global/preload.js
lib/tor-browser/chrome/toolkit/content/global/printPageSetup.js
lib/tor-browser/chrome/toolkit/content/global/printPageSetup.xul
@@ -2010,6 +2455,7 @@ lib/tor-browser/chrome/toolkit/content/global/printdialog.js
lib/tor-browser/chrome/toolkit/content/global/printdialog.xul
lib/tor-browser/chrome/toolkit/content/global/printjoboptions.js
lib/tor-browser/chrome/toolkit/content/global/printjoboptions.xul
+lib/tor-browser/chrome/toolkit/content/global/process-content.js
lib/tor-browser/chrome/toolkit/content/global/reader/aboutReader.html
lib/tor-browser/chrome/toolkit/content/global/reader/aboutReader.js
lib/tor-browser/chrome/toolkit/content/global/remote-test-ipc.js
@@ -2029,6 +2475,7 @@ lib/tor-browser/chrome/toolkit/content/global/textbox.css
lib/tor-browser/chrome/toolkit/content/global/treeUtils.js
lib/tor-browser/chrome/toolkit/content/global/viewPartialSource.js
lib/tor-browser/chrome/toolkit/content/global/viewPartialSource.xul
+lib/tor-browser/chrome/toolkit/content/global/viewSource-content.js
lib/tor-browser/chrome/toolkit/content/global/viewSource.css
lib/tor-browser/chrome/toolkit/content/global/viewSource.js
lib/tor-browser/chrome/toolkit/content/global/viewSource.xul
@@ -2077,10 +2524,6 @@ lib/tor-browser/chrome/toolkit/content/mozapps/handling/dialog.js
lib/tor-browser/chrome/toolkit/content/mozapps/handling/dialog.xul
lib/tor-browser/chrome/toolkit/content/mozapps/handling/handler.css
lib/tor-browser/chrome/toolkit/content/mozapps/handling/handler.xml
-lib/tor-browser/chrome/toolkit/content/mozapps/plugins/pluginFinderBinding.css
-lib/tor-browser/chrome/toolkit/content/mozapps/plugins/pluginProblem.xml
-lib/tor-browser/chrome/toolkit/content/mozapps/plugins/pluginProblemBinding.css
-lib/tor-browser/chrome/toolkit/content/mozapps/plugins/pluginProblemContent.css
lib/tor-browser/chrome/toolkit/content/mozapps/preferences/changemp.js
lib/tor-browser/chrome/toolkit/content/mozapps/preferences/changemp.xul
lib/tor-browser/chrome/toolkit/content/mozapps/preferences/fontbuilder.js
@@ -2090,34 +2533,39 @@ lib/tor-browser/chrome/toolkit/content/mozapps/profile/createProfileWizard.js
lib/tor-browser/chrome/toolkit/content/mozapps/profile/createProfileWizard.xul
lib/tor-browser/chrome/toolkit/content/mozapps/profile/profileSelection.js
lib/tor-browser/chrome/toolkit/content/mozapps/profile/profileSelection.xul
-lib/tor-browser/chrome/toolkit/content/mozapps/update/history.js
-lib/tor-browser/chrome/toolkit/content/mozapps/update/history.xul
-lib/tor-browser/chrome/toolkit/content/mozapps/update/updates.css
-lib/tor-browser/chrome/toolkit/content/mozapps/update/updates.js
-lib/tor-browser/chrome/toolkit/content/mozapps/update/updates.xml
-lib/tor-browser/chrome/toolkit/content/mozapps/update/updates.xul
lib/tor-browser/chrome/toolkit/content/mozapps/xpinstall/xpinstallConfirm.css
lib/tor-browser/chrome/toolkit/content/mozapps/xpinstall/xpinstallConfirm.js
lib/tor-browser/chrome/toolkit/content/mozapps/xpinstall/xpinstallConfirm.xul
lib/tor-browser/chrome/toolkit/content/mozapps/xpinstall/xpinstallItem.xml
+lib/tor-browser/chrome/toolkit/content/passwordmgr/login.xml
lib/tor-browser/chrome/toolkit/content/passwordmgr/passwordManager.js
lib/tor-browser/chrome/toolkit/content/passwordmgr/passwordManager.xul
lib/tor-browser/chrome/toolkit/content/passwordmgr/passwordManagerCommon.js
lib/tor-browser/chrome/toolkit/content/passwordmgr/passwordManagerExceptions.js
lib/tor-browser/chrome/toolkit/content/passwordmgr/passwordManagerExceptions.xul
+lib/tor-browser/chrome/toolkit/content/passwordmgr/recipes.json
lib/tor-browser/chrome/toolkit/content/satchel/formSubmitListener.js
lib/tor-browser/chrome/toolkit/content/xbl-marquee/xbl-marquee.css
lib/tor-browser/chrome/toolkit/content/xbl-marquee/xbl-marquee.xml
+lib/tor-browser/chrome/toolkit/pluginproblem/pluginFinderBinding.css
+lib/tor-browser/chrome/toolkit/pluginproblem/pluginProblem.xml
+lib/tor-browser/chrome/toolkit/pluginproblem/pluginProblemBinding.css
+lib/tor-browser/chrome/toolkit/pluginproblem/pluginProblemContent.css
+lib/tor-browser/chrome/toolkit/res/arrow-left.gif
+lib/tor-browser/chrome/toolkit/res/arrow-right.gif
lib/tor-browser/chrome/toolkit/res/arrow.gif
+lib/tor-browser/chrome/toolkit/res/arrowd-left.gif
+lib/tor-browser/chrome/toolkit/res/arrowd-right.gif
lib/tor-browser/chrome/toolkit/res/arrowd.gif
lib/tor-browser/chrome/toolkit/res/broken-image.png
lib/tor-browser/chrome/toolkit/res/counterstyles.css
lib/tor-browser/chrome/toolkit/res/forms.css
-lib/tor-browser/chrome/toolkit/res/full-screen-override.css
lib/tor-browser/chrome/toolkit/res/hiddenWindow.html
lib/tor-browser/chrome/toolkit/res/html.css
lib/tor-browser/chrome/toolkit/res/loading-image.png
lib/tor-browser/chrome/toolkit/res/mathml.css
+lib/tor-browser/chrome/toolkit/res/noframes.css
+lib/tor-browser/chrome/toolkit/res/noscript.css
lib/tor-browser/chrome/toolkit/res/number-control.css
lib/tor-browser/chrome/toolkit/res/plaintext.css
lib/tor-browser/chrome/toolkit/res/quirk.css
@@ -2129,9 +2577,11 @@ lib/tor-browser/chrome/toolkit/skin/classic/global/aboutCache.css
lib/tor-browser/chrome/toolkit/skin/classic/global/aboutCacheEntry.css
lib/tor-browser/chrome/toolkit/skin/classic/global/aboutMemory.css
lib/tor-browser/chrome/toolkit/skin/classic/global/aboutReader.css
+lib/tor-browser/chrome/toolkit/skin/classic/global/aboutReaderContent.css
+lib/tor-browser/chrome/toolkit/skin/classic/global/aboutReaderControls.css
lib/tor-browser/chrome/toolkit/skin/classic/global/aboutSupport.css
+lib/tor-browser/chrome/toolkit/skin/classic/global/alerts/alert-common.css
lib/tor-browser/chrome/toolkit/skin/classic/global/alerts/alert.css
-lib/tor-browser/chrome/toolkit/skin/classic/global/alerts/notification-48.png
lib/tor-browser/chrome/toolkit/skin/classic/global/appPicker.css
lib/tor-browser/chrome/toolkit/skin/classic/global/arrow.css
lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/arrow-dn-dis.gif
@@ -2140,12 +2590,10 @@ lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/arrow-dn-sharp.gif
lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/arrow-dn.gif
lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/arrow-down.png
lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/arrow-lft-dis.gif
-lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/arrow-lft-hov.gif
lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/arrow-lft-sharp-end.gif
lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/arrow-lft-sharp.gif
lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/arrow-lft.gif
lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/arrow-rit-dis.gif
-lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/arrow-rit-hov.gif
lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/arrow-rit-sharp-end.gif
lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/arrow-rit-sharp.gif
lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/arrow-rit.gif
@@ -2203,45 +2651,39 @@ lib/tor-browser/chrome/toolkit/skin/classic/global/icons/autocomplete-search.svg
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/autoscroll.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/blacklist_favicon.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/blacklist_large.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/close-lunaBlue.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/close-lunaOlive.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/close-lunaSilver.png
+lib/tor-browser/chrome/toolkit/skin/classic/global/icons/close-inverted.png
+lib/tor-browser/chrome/toolkit/skin/classic/global/icons/close-inverted@2x.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/close.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/close.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/icons/close@2x.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/collapse.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/error-16.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/error-24.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/error-48.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/error-64.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/expand.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/find-arrows.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/find.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/folder-item.png
+lib/tor-browser/chrome/toolkit/skin/classic/global/icons/info.svg
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/information-16.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/information-24.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/information-32.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/information-48.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/information-64.png
+lib/tor-browser/chrome/toolkit/skin/classic/global/icons/loading-inverted.png
+lib/tor-browser/chrome/toolkit/skin/classic/global/icons/loading-inverted@2x.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/loading_16.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/panelarrow-horizontal.svg
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/panelarrow-vertical.svg
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/question-16.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/question-24.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/question-48.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/question-64.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/resizer-rtl.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/resizer.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/sslWarning.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/tabprompts-bgtexture.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/warning-16.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/warning-24.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/warning-64.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/warning-large.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/warning.svg
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/webapps-16.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/webapps-64.png
lib/tor-browser/chrome/toolkit/skin/classic/global/icons/windowControls.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/wrap.png
lib/tor-browser/chrome/toolkit/skin/classic/global/in-content/check-partial.svg
lib/tor-browser/chrome/toolkit/skin/classic/global/in-content/check.svg
lib/tor-browser/chrome/toolkit/skin/classic/global/in-content/common.css
@@ -2249,8 +2691,6 @@ lib/tor-browser/chrome/toolkit/skin/classic/global/in-content/dropdown.svg
lib/tor-browser/chrome/toolkit/skin/classic/global/in-content/help-glyph.svg
lib/tor-browser/chrome/toolkit/skin/classic/global/in-content/info-pages.css
lib/tor-browser/chrome/toolkit/skin/classic/global/in-content/radio.svg
-lib/tor-browser/chrome/toolkit/skin/classic/global/inContentUI.css
-lib/tor-browser/chrome/toolkit/skin/classic/global/inContentUI/background-texture.png
lib/tor-browser/chrome/toolkit/skin/classic/global/linkTree.css
lib/tor-browser/chrome/toolkit/skin/classic/global/listbox.css
lib/tor-browser/chrome/toolkit/skin/classic/global/media/TopLevelImageDocument.css
@@ -2274,7 +2714,11 @@ lib/tor-browser/chrome/toolkit/skin/classic/global/media/videocontrols.css
lib/tor-browser/chrome/toolkit/skin/classic/global/media/volume-empty.png
lib/tor-browser/chrome/toolkit/skin/classic/global/media/volume-full.png
lib/tor-browser/chrome/toolkit/skin/classic/global/menu.css
+lib/tor-browser/chrome/toolkit/skin/classic/global/menu/shared-menu-check-active.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/menu/shared-menu-check-black.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/menu/shared-menu-check-hover.svg
lib/tor-browser/chrome/toolkit/skin/classic/global/menu/shared-menu-check.png
+lib/tor-browser/chrome/toolkit/skin/classic/global/menu/shared-menu-check@2x.png
lib/tor-browser/chrome/toolkit/skin/classic/global/menulist.css
lib/tor-browser/chrome/toolkit/skin/classic/global/netError.css
lib/tor-browser/chrome/toolkit/skin/classic/global/notification.css
@@ -2300,6 +2744,7 @@ lib/tor-browser/chrome/toolkit/skin/classic/global/reader/RM-Plus-24x24.svg
lib/tor-browser/chrome/toolkit/skin/classic/global/reader/RM-Reading-List-24x24.svg
lib/tor-browser/chrome/toolkit/skin/classic/global/reader/RM-Type-Controls-24x24.svg
lib/tor-browser/chrome/toolkit/skin/classic/global/reader/RM-Type-Controls-Arrow.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/reader/pocket.svg
lib/tor-browser/chrome/toolkit/skin/classic/global/resizer.css
lib/tor-browser/chrome/toolkit/skin/classic/global/richlistbox.css
lib/tor-browser/chrome/toolkit/skin/classic/global/scale.css
@@ -2329,37 +2774,37 @@ lib/tor-browser/chrome/toolkit/skin/classic/global/tree/sort-dsc.png
lib/tor-browser/chrome/toolkit/skin/classic/global/tree/twisty-clsd.png
lib/tor-browser/chrome/toolkit/skin/classic/global/tree/twisty-open.png
lib/tor-browser/chrome/toolkit/skin/classic/global/wizard.css
+lib/tor-browser/chrome/toolkit/skin/classic/help/Toolbar-rtl.png
+lib/tor-browser/chrome/toolkit/skin/classic/help/Toolbar.png
+lib/tor-browser/chrome/toolkit/skin/classic/help/Weblink-rtl.png
+lib/tor-browser/chrome/toolkit/skin/classic/help/Weblink.png
+lib/tor-browser/chrome/toolkit/skin/classic/help/helpFileLayout.css
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/aboutNetworking.css
+lib/tor-browser/chrome/toolkit/skin/classic/mozapps/aboutServiceWorkers.css
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/downloads/downloadButtons.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/downloads/downloadIcon.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/downloads/downloads.css
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/downloads/unknownContentType.css
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/about.css
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/alerticon-error.png
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/alerticon-info-negative.png
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/alerticon-info-positive.png
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/alerticon-warning.png
+lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/alerticon-error.svg
+lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/alerticon-info-negative.svg
+lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/alerticon-info-positive.svg
+lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/alerticon-warning.svg
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/blocklist.css
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/cancel.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/category-available.png
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/category-dictionaries.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/category-discover.png
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/category-experiments.png
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/category-extensions.png
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/category-languages.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/category-plugins.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/category-recent.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/category-search.png
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/category-searchengines.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/category-service.png
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/category-themes.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric-16.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/discover-logo.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/eula.css
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/experimentGeneric.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric-16.png
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric.png
+lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric.svg
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/extensions.css
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/heart.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/localeGeneric.png
@@ -2368,10 +2813,6 @@ lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/newaddon.css
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/rating-not-won.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/rating-won.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/selectAddons.css
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/stripes-error.png
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/stripes-info-negative.png
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/stripes-info-positive.png
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/stripes-warning.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/themeGeneric-16.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/themeGeneric.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/update.css
@@ -2380,8 +2821,8 @@ lib/tor-browser/chrome/toolkit/skin/classic/mozapps/formautofill/requestAutocomp
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/handling/handling.css
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/passwordmgr/key-16.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/passwordmgr/key-64.png
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/passwordmgr/key.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/places/defaultFavicon.png
+lib/tor-browser/chrome/toolkit/skin/classic/mozapps/places/defaultFavicon@2x.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginActivate.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginBlocked.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginClose.png
@@ -2390,8 +2831,6 @@ lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginDisable
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginDownload.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginMissing.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginStripe.png
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/notifyPluginCrashed.png
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/notifyPluginGeneric.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/pluginBlocked-64.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/pluginBlocked.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/pluginGeneric-16.png
@@ -2404,7 +2843,6 @@ lib/tor-browser/chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/update/updates.css
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/viewsource/viewsource.css
lib/tor-browser/chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallConfirm.css
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png
lib/tor-browser/components/ActivityMessageConfigurator.js
lib/tor-browser/components/ActivityProxy.js
lib/tor-browser/components/ActivityRequestHandler.js
@@ -2412,6 +2850,8 @@ lib/tor-browser/components/ActivityWrapper.js
lib/tor-browser/components/AlarmsManager.js
lib/tor-browser/components/AppsService.js
lib/tor-browser/components/BrowserElementParent.js
+lib/tor-browser/components/BrowserElementProxy.js
+lib/tor-browser/components/CSSUnprefixingService.js
lib/tor-browser/components/ChromeNotifications.js
lib/tor-browser/components/ColorAnalyzer.js
lib/tor-browser/components/ConsoleAPIStorage.js
@@ -2424,10 +2864,13 @@ lib/tor-browser/components/FeedProcessor.js
lib/tor-browser/components/FormAutofillContentService.js
lib/tor-browser/components/FormAutofillStartup.js
lib/tor-browser/components/FormHistoryStartup.js
+lib/tor-browser/components/InstallPackagedWebapp.js
lib/tor-browser/components/MainProcessSingleton.js
lib/tor-browser/components/MozKeyboard.js
lib/tor-browser/components/NetworkGeolocationProvider.js
lib/tor-browser/components/NotificationStorage.js
+lib/tor-browser/components/PACGenerator.js
+lib/tor-browser/components/PackagedAppUtils.js
lib/tor-browser/components/PageThumbsProtocol.js
lib/tor-browser/components/Payment.js
lib/tor-browser/components/PaymentFlowInfo.js
@@ -2435,8 +2878,11 @@ lib/tor-browser/components/PermissionSettings.js
lib/tor-browser/components/PhoneNumberService.js
lib/tor-browser/components/PlacesCategoriesStarter.js
lib/tor-browser/components/PresentationDeviceInfoManager.js
+lib/tor-browser/components/PrivateBrowsingTrackingProtectionWhitelist.js
lib/tor-browser/components/Push.js
-lib/tor-browser/components/PushServiceLauncher.js
+lib/tor-browser/components/PushClient.js
+lib/tor-browser/components/PushNotificationService.js
+lib/tor-browser/components/RemoteWebNavigation.js
lib/tor-browser/components/RequestSyncManager.js
lib/tor-browser/components/RequestSyncScheduler.js
lib/tor-browser/components/SettingsManager.js
@@ -2445,9 +2891,7 @@ lib/tor-browser/components/SlowScriptDebug.js
lib/tor-browser/components/SystemMessageCache.js
lib/tor-browser/components/SystemMessageInternal.js
lib/tor-browser/components/SystemMessageManager.js
-lib/tor-browser/components/TCPServerSocket.js
-lib/tor-browser/components/TCPSocket.js
-lib/tor-browser/components/TCPSocketParentIntermediary.js
+lib/tor-browser/components/TCPPresentationServer.js
lib/tor-browser/components/TelemetryStartup.js
lib/tor-browser/components/UnifiedComplete.js
lib/tor-browser/components/Weave.js
@@ -2458,29 +2902,29 @@ lib/tor-browser/components/addonManager.js
lib/tor-browser/components/amContentHandler.js
lib/tor-browser/components/amInstallTrigger.js
lib/tor-browser/components/amWebInstallListener.js
+lib/tor-browser/components/captivedetect.js
lib/tor-browser/components/components.manifest
lib/tor-browser/components/contentAreaDropListener.js
lib/tor-browser/components/crypto-SDR.js
+lib/tor-browser/components/defaultShims.js
lib/tor-browser/components/htmlMenuBuilder.js
lib/tor-browser/components/interfaces.xpt
lib/tor-browser/components/jsconsole-clhandler.js
-lib/tor-browser/components/libmozgnome.so
lib/tor-browser/components/marionettecomponent.js
lib/tor-browser/components/messageWakeupService.js
lib/tor-browser/components/multiprocessShims.js
lib/tor-browser/components/nsAsyncShutdown.js
lib/tor-browser/components/nsBlocklistService.js
+lib/tor-browser/components/nsBlocklistServiceContent.js
lib/tor-browser/components/nsContentDispatchChooser.js
lib/tor-browser/components/nsContentPrefService.js
lib/tor-browser/components/nsCrashMonitor.js
-lib/tor-browser/components/nsDOMIdentity.js
lib/tor-browser/components/nsDefaultCLH.js
lib/tor-browser/components/nsFilePicker.js
lib/tor-browser/components/nsFormAutoComplete.js
lib/tor-browser/components/nsFormHistory.js
lib/tor-browser/components/nsHandlerService.js
lib/tor-browser/components/nsHelperAppDlg.js
-lib/tor-browser/components/nsIDService.js
lib/tor-browser/components/nsINIProcessor.js
lib/tor-browser/components/nsInputListAutoComplete.js
lib/tor-browser/components/nsLivemarkService.js
@@ -2502,10 +2946,9 @@ lib/tor-browser/components/nsUrlClassifierLib.js
lib/tor-browser/components/nsUrlClassifierListManager.js
lib/tor-browser/components/nsWebHandlerApp.js
lib/tor-browser/components/recording-cmdline.js
-lib/tor-browser/components/remoteTagService.js
+lib/tor-browser/components/simpleServices.js
lib/tor-browser/components/storage-json.js
lib/tor-browser/components/txEXSLTRegExFunctions.js
-lib/tor-browser/defaults/autoconfig/platform.js
lib/tor-browser/defaults/autoconfig/prefcalls.js
lib/tor-browser/defaults/pref/channel-prefs.js
lib/tor-browser/defaults/pref/services-sync.js
@@ -2551,8 +2994,8 @@ lib/tor-browser/hyphenation/hyph_sl.dic
lib/tor-browser/hyphenation/hyph_sv.dic
lib/tor-browser/hyphenation/hyph_tr.dic
lib/tor-browser/hyphenation/hyph_uk.dic
-lib/tor-browser/libmozalloc.so
-lib/tor-browser/libmozjs.so
+lib/tor-browser/liblgpllibs.so
+lib/tor-browser/libmozsqlite3.so
lib/tor-browser/libxul.so
lib/tor-browser/modules/AboutReader.jsm
lib/tor-browser/modules/ActivitiesService.jsm
@@ -2560,6 +3003,7 @@ lib/tor-browser/modules/ActivitiesServiceFilter.jsm
lib/tor-browser/modules/AddonManager.jsm
lib/tor-browser/modules/AlarmDB.jsm
lib/tor-browser/modules/AlarmService.jsm
+lib/tor-browser/modules/AppConstants.jsm
lib/tor-browser/modules/AppDownloadManager.jsm
lib/tor-browser/modules/AppsServiceChild.jsm
lib/tor-browser/modules/AppsUtils.jsm
@@ -2577,6 +3021,7 @@ lib/tor-browser/modules/BrowserUtils.jsm
lib/tor-browser/modules/CertUtils.jsm
lib/tor-browser/modules/CharsetMenu.jsm
lib/tor-browser/modules/ChromeManifestParser.jsm
+lib/tor-browser/modules/ClientID.jsm
lib/tor-browser/modules/CloudSync.jsm
lib/tor-browser/modules/CloudSyncAdapters.jsm
lib/tor-browser/modules/CloudSyncBookmarks.jsm
@@ -2589,6 +3034,8 @@ lib/tor-browser/modules/ClusterLib.js
lib/tor-browser/modules/ColorAnalyzer_worker.js
lib/tor-browser/modules/ColorConversion.js
lib/tor-browser/modules/CommonDialog.jsm
+lib/tor-browser/modules/CompatWarning.jsm
+lib/tor-browser/modules/Console.jsm
lib/tor-browser/modules/ContactDB.jsm
lib/tor-browser/modules/ContactService.jsm
lib/tor-browser/modules/ContentPrefInstance.jsm
@@ -2599,7 +3046,6 @@ lib/tor-browser/modules/ContentPrefStore.jsm
lib/tor-browser/modules/ContentPrefUtils.jsm
lib/tor-browser/modules/CrashMonitor.jsm
lib/tor-browser/modules/Credentials.jsm
-lib/tor-browser/modules/DOMIdentity.jsm
lib/tor-browser/modules/DOMRequestHelper.jsm
lib/tor-browser/modules/DataStoreChangeNotifier.jsm
lib/tor-browser/modules/DataStoreCursorImpl.jsm
@@ -2607,7 +3053,6 @@ lib/tor-browser/modules/DataStoreDB.jsm
lib/tor-browser/modules/DeferredSave.jsm
lib/tor-browser/modules/DeferredTask.jsm
lib/tor-browser/modules/Deprecated.jsm
-lib/tor-browser/modules/Dict.jsm
lib/tor-browser/modules/DownloadCore.jsm
lib/tor-browser/modules/DownloadImport.jsm
lib/tor-browser/modules/DownloadIntegration.jsm
@@ -2619,6 +3064,11 @@ lib/tor-browser/modules/DownloadTaskbarProgress.jsm
lib/tor-browser/modules/DownloadUIHelper.jsm
lib/tor-browser/modules/DownloadUtils.jsm
lib/tor-browser/modules/Downloads.jsm
+lib/tor-browser/modules/Extension.jsm
+lib/tor-browser/modules/ExtensionContent.jsm
+lib/tor-browser/modules/ExtensionManagement.jsm
+lib/tor-browser/modules/ExtensionStorage.jsm
+lib/tor-browser/modules/ExtensionUtils.jsm
lib/tor-browser/modules/FileUtils.jsm
lib/tor-browser/modules/Finder.jsm
lib/tor-browser/modules/ForgetAboutSite.jsm
@@ -2634,7 +3084,10 @@ lib/tor-browser/modules/FxAccountsClient.jsm
lib/tor-browser/modules/FxAccountsCommon.js
lib/tor-browser/modules/FxAccountsOAuthClient.jsm
lib/tor-browser/modules/FxAccountsOAuthGrantClient.jsm
+lib/tor-browser/modules/FxAccountsProfile.jsm
lib/tor-browser/modules/FxAccountsProfileClient.jsm
+lib/tor-browser/modules/FxAccountsStorage.jsm
+lib/tor-browser/modules/FxAccountsWebChannel.jsm
lib/tor-browser/modules/GMPInstallManager.jsm
lib/tor-browser/modules/GMPUtils.jsm
lib/tor-browser/modules/Geometry.jsm
@@ -2642,6 +3095,7 @@ lib/tor-browser/modules/HealthReport.jsm
lib/tor-browser/modules/History.jsm
lib/tor-browser/modules/Http.jsm
lib/tor-browser/modules/ISO8601DateUtils.jsm
+lib/tor-browser/modules/ImageObjectProcessor.jsm
lib/tor-browser/modules/ImportExport.jsm
lib/tor-browser/modules/IndexedDBHelper.jsm
lib/tor-browser/modules/InlineSpellChecker.jsm
@@ -2653,13 +3107,21 @@ lib/tor-browser/modules/Langpacks.jsm
lib/tor-browser/modules/LightweightThemeConsumer.jsm
lib/tor-browser/modules/LightweightThemeManager.jsm
lib/tor-browser/modules/LoadContextInfo.jsm
+lib/tor-browser/modules/Locale.jsm
lib/tor-browser/modules/Log.jsm
+lib/tor-browser/modules/LoginDoorhangers.jsm
lib/tor-browser/modules/LoginHelper.jsm
lib/tor-browser/modules/LoginImport.jsm
lib/tor-browser/modules/LoginManagerContent.jsm
+lib/tor-browser/modules/LoginManagerContextMenu.jsm
lib/tor-browser/modules/LoginManagerParent.jsm
+lib/tor-browser/modules/LoginRecipes.jsm
lib/tor-browser/modules/LoginStore.jsm
+lib/tor-browser/modules/ManifestFinder.jsm
+lib/tor-browser/modules/ManifestObtainer.jsm
lib/tor-browser/modules/ManifestProcessor.jsm
+lib/tor-browser/modules/MatchPattern.jsm
+lib/tor-browser/modules/MessageBroadcaster.jsm
lib/tor-browser/modules/MessagePortBase.jsm
lib/tor-browser/modules/MessagePortWorker.js
lib/tor-browser/modules/Metrics.jsm
@@ -2669,6 +3131,8 @@ lib/tor-browser/modules/NativeApp.jsm
lib/tor-browser/modules/NetUtil.jsm
lib/tor-browser/modules/NewTabUtils.jsm
lib/tor-browser/modules/NotificationDB.jsm
+lib/tor-browser/modules/OSCrypto.jsm
+lib/tor-browser/modules/ObjectUtils.jsm
lib/tor-browser/modules/OfflineCacheInstaller.jsm
lib/tor-browser/modules/OperatorApps.jsm
lib/tor-browser/modules/PageMenu.jsm
@@ -2688,6 +3152,7 @@ lib/tor-browser/modules/PhoneNumberNormalizer.jsm
lib/tor-browser/modules/PhoneNumberUtils.jsm
lib/tor-browser/modules/PlacesBackups.jsm
lib/tor-browser/modules/PlacesDBUtils.jsm
+lib/tor-browser/modules/PlacesRemoteTabsAutocompleteProvider.jsm
lib/tor-browser/modules/PlacesSearchAutocompleteProvider.jsm
lib/tor-browser/modules/PlacesTransactions.jsm
lib/tor-browser/modules/PlacesUtils.jsm
@@ -2697,19 +3162,27 @@ lib/tor-browser/modules/Preferences.jsm
lib/tor-browser/modules/Prefetcher.jsm
lib/tor-browser/modules/PresentationDeviceInfoManager.jsm
lib/tor-browser/modules/PrivateBrowsingUtils.jsm
+lib/tor-browser/modules/ProfileAge.jsm
lib/tor-browser/modules/Promise-backend.js
lib/tor-browser/modules/Promise.jsm
+lib/tor-browser/modules/PromiseMessage.jsm
lib/tor-browser/modules/PromiseUtils.jsm
lib/tor-browser/modules/PromiseWorker.jsm
lib/tor-browser/modules/PropertyListUtils.jsm
+lib/tor-browser/modules/PushCrypto.jsm
+lib/tor-browser/modules/PushDB.jsm
+lib/tor-browser/modules/PushRecord.jsm
lib/tor-browser/modules/PushService.jsm
+lib/tor-browser/modules/PushServiceChildPreload.jsm
+lib/tor-browser/modules/PushServiceHttp2.jsm
+lib/tor-browser/modules/PushServiceWebSocket.jsm
lib/tor-browser/modules/ReaderMode.jsm
lib/tor-browser/modules/RemoteAddonsChild.jsm
lib/tor-browser/modules/RemoteAddonsParent.jsm
lib/tor-browser/modules/RemoteController.jsm
lib/tor-browser/modules/RemoteFinder.jsm
+lib/tor-browser/modules/RemotePageManager.jsm
lib/tor-browser/modules/RemoteSecurityUI.jsm
-lib/tor-browser/modules/RemoteWebNavigation.jsm
lib/tor-browser/modules/RemoteWebProgress.jsm
lib/tor-browser/modules/RequestAutocompleteUI.jsm
lib/tor-browser/modules/RequestSyncApp.jsm
@@ -2720,6 +3193,7 @@ lib/tor-browser/modules/ResourceStatsDB.jsm
lib/tor-browser/modules/ResourceStatsService.jsm
lib/tor-browser/modules/RokuApp.jsm
lib/tor-browser/modules/SafeBrowsing.jsm
+lib/tor-browser/modules/Schemas.jsm
lib/tor-browser/modules/ScriptPreloader.jsm
lib/tor-browser/modules/ScrollPosition.jsm
lib/tor-browser/modules/SearchStaticData.jsm
@@ -2727,9 +3201,11 @@ lib/tor-browser/modules/SearchSuggestionController.jsm
lib/tor-browser/modules/SelectContentHelper.jsm
lib/tor-browser/modules/SelectParentHelper.jsm
lib/tor-browser/modules/Services.jsm
+lib/tor-browser/modules/SessionRecorder.jsm
lib/tor-browser/modules/SettingsDB.jsm
lib/tor-browser/modules/SettingsRequestManager.jsm
lib/tor-browser/modules/SharedPromptUtils.jsm
+lib/tor-browser/modules/ShimWaiver.jsm
lib/tor-browser/modules/ShortcutUtils.jsm
lib/tor-browser/modules/SimpleServiceDiscovery.jsm
lib/tor-browser/modules/Sntp.jsm
@@ -2738,27 +3214,38 @@ lib/tor-browser/modules/SpatialNavigation.jsm
lib/tor-browser/modules/Sqlite.jsm
lib/tor-browser/modules/StoreTrustAnchor.jsm
lib/tor-browser/modules/SystemMessagePermissionsChecker.jsm
+lib/tor-browser/modules/SystemUpdateService.jsm
lib/tor-browser/modules/Task.jsm
-lib/tor-browser/modules/TelemetryFile.jsm
+lib/tor-browser/modules/TelemetryArchive.jsm
+lib/tor-browser/modules/TelemetryController.jsm
+lib/tor-browser/modules/TelemetryEnvironment.jsm
lib/tor-browser/modules/TelemetryLog.jsm
-lib/tor-browser/modules/TelemetryPing.jsm
+lib/tor-browser/modules/TelemetryReportingPolicy.jsm
+lib/tor-browser/modules/TelemetrySend.jsm
lib/tor-browser/modules/TelemetrySession.jsm
lib/tor-browser/modules/TelemetryStopwatch.jsm
+lib/tor-browser/modules/TelemetryStorage.jsm
lib/tor-browser/modules/TelemetryTimestamps.jsm
+lib/tor-browser/modules/TelemetryUtils.jsm
lib/tor-browser/modules/ThirdPartyCookieProbe.jsm
lib/tor-browser/modules/Timer.jsm
lib/tor-browser/modules/Troubleshoot.jsm
-lib/tor-browser/modules/TrustedHostedAppsUtils.jsm
lib/tor-browser/modules/UITelemetry.jsm
-lib/tor-browser/modules/UpdateChannel.jsm
+lib/tor-browser/modules/UpdateUtils.jsm
lib/tor-browser/modules/UserAgentOverrides.jsm
lib/tor-browser/modules/UserAgentUpdates.jsm
lib/tor-browser/modules/UserCustomizations.jsm
+lib/tor-browser/modules/ValueExtractor.jsm
+lib/tor-browser/modules/ViewSourceBrowser.jsm
lib/tor-browser/modules/WebChannel.jsm
+lib/tor-browser/modules/WebNavigation.jsm
+lib/tor-browser/modules/WebNavigationContent.js
+lib/tor-browser/modules/WebRequest.jsm
+lib/tor-browser/modules/WebRequestCommon.jsm
+lib/tor-browser/modules/WebRequestContent.js
lib/tor-browser/modules/WebappOSUtils.jsm
lib/tor-browser/modules/Webapps.jsm
lib/tor-browser/modules/WindowDraggingUtils.jsm
-lib/tor-browser/modules/WindowsPrefSync.jsm
lib/tor-browser/modules/WorkerAPI.jsm
lib/tor-browser/modules/XPCOMUtils.jsm
lib/tor-browser/modules/XPathGenerator.jsm
@@ -2771,8 +3258,9 @@ lib/tor-browser/modules/accessibility/Gestures.jsm
lib/tor-browser/modules/accessibility/OutputGenerator.jsm
lib/tor-browser/modules/accessibility/PointerAdapter.jsm
lib/tor-browser/modules/accessibility/Presentation.jsm
-lib/tor-browser/modules/accessibility/TraversalRules.jsm
+lib/tor-browser/modules/accessibility/Traversal.jsm
lib/tor-browser/modules/accessibility/Utils.jsm
+lib/tor-browser/modules/addons/AddonConstants.jsm
lib/tor-browser/modules/addons/AddonLogging.jsm
lib/tor-browser/modules/addons/AddonRepository.jsm
lib/tor-browser/modules/addons/AddonRepository_SQLiteMigrator.jsm
@@ -2781,7 +3269,9 @@ lib/tor-browser/modules/addons/Content.js
lib/tor-browser/modules/addons/GMPProvider.jsm
lib/tor-browser/modules/addons/LightweightThemeImageOptimizer.jsm
lib/tor-browser/modules/addons/PluginProvider.jsm
+lib/tor-browser/modules/addons/ProductAddonChecker.jsm
lib/tor-browser/modules/addons/SpellCheckDictionaryBootstrap.js
+lib/tor-browser/modules/addons/WebExtensionBootstrap.js
lib/tor-browser/modules/addons/XPIProvider.jsm
lib/tor-browser/modules/addons/XPIProviderUtils.js
lib/tor-browser/modules/commonjs/dev/debuggee.js
@@ -2789,6 +3279,8 @@ lib/tor-browser/modules/commonjs/dev/frame-script.js
lib/tor-browser/modules/commonjs/dev/panel.js
lib/tor-browser/modules/commonjs/dev/panel/view.js
lib/tor-browser/modules/commonjs/dev/ports.js
+lib/tor-browser/modules/commonjs/dev/theme.js
+lib/tor-browser/modules/commonjs/dev/theme/hooks.js
lib/tor-browser/modules/commonjs/dev/toolbox.js
lib/tor-browser/modules/commonjs/dev/utils.js
lib/tor-browser/modules/commonjs/dev/volcan.js
@@ -2802,16 +3294,17 @@ lib/tor-browser/modules/commonjs/diffpatcher/test/index.js
lib/tor-browser/modules/commonjs/diffpatcher/test/patch.js
lib/tor-browser/modules/commonjs/diffpatcher/test/tap.js
lib/tor-browser/modules/commonjs/framescript/FrameScriptManager.jsm
-lib/tor-browser/modules/commonjs/framescript/LoaderHelper.jsm
+lib/tor-browser/modules/commonjs/framescript/content.jsm
lib/tor-browser/modules/commonjs/framescript/context-menu.js
-lib/tor-browser/modules/commonjs/framescript/contextmenu-events.js
lib/tor-browser/modules/commonjs/framescript/manager.js
-lib/tor-browser/modules/commonjs/framescript/tab-events.js
lib/tor-browser/modules/commonjs/framescript/util.js
lib/tor-browser/modules/commonjs/index.js
+lib/tor-browser/modules/commonjs/jetpack-id/index.js
lib/tor-browser/modules/commonjs/method/core.js
lib/tor-browser/modules/commonjs/method/test/browser.js
lib/tor-browser/modules/commonjs/method/test/common.js
+lib/tor-browser/modules/commonjs/mozilla-toolkit-versioning/index.js
+lib/tor-browser/modules/commonjs/mozilla-toolkit-versioning/lib/utils.js
lib/tor-browser/modules/commonjs/node/os.js
lib/tor-browser/modules/commonjs/sdk/addon/bootstrap.js
lib/tor-browser/modules/commonjs/sdk/addon/events.js
@@ -2829,9 +3322,14 @@ lib/tor-browser/modules/commonjs/sdk/content/content-worker.js
lib/tor-browser/modules/commonjs/sdk/content/content.js
lib/tor-browser/modules/commonjs/sdk/content/context-menu.js
lib/tor-browser/modules/commonjs/sdk/content/events.js
+lib/tor-browser/modules/commonjs/sdk/content/l10n-html.js
lib/tor-browser/modules/commonjs/sdk/content/loader.js
lib/tor-browser/modules/commonjs/sdk/content/mod.js
+lib/tor-browser/modules/commonjs/sdk/content/page-mod.js
+lib/tor-browser/modules/commonjs/sdk/content/page-worker.js
lib/tor-browser/modules/commonjs/sdk/content/sandbox.js
+lib/tor-browser/modules/commonjs/sdk/content/sandbox/events.js
+lib/tor-browser/modules/commonjs/sdk/content/tab-events.js
lib/tor-browser/modules/commonjs/sdk/content/thumbnail.js
lib/tor-browser/modules/commonjs/sdk/content/utils.js
lib/tor-browser/modules/commonjs/sdk/content/worker-child.js
@@ -2848,21 +3346,12 @@ lib/tor-browser/modules/commonjs/sdk/core/observer.js
lib/tor-browser/modules/commonjs/sdk/core/promise.js
lib/tor-browser/modules/commonjs/sdk/core/reference.js
lib/tor-browser/modules/commonjs/sdk/deprecated/api-utils.js
-lib/tor-browser/modules/commonjs/sdk/deprecated/cortex.js
-lib/tor-browser/modules/commonjs/sdk/deprecated/errors.js
-lib/tor-browser/modules/commonjs/sdk/deprecated/events.js
lib/tor-browser/modules/commonjs/sdk/deprecated/events/assembler.js
-lib/tor-browser/modules/commonjs/sdk/deprecated/light-traits.js
-lib/tor-browser/modules/commonjs/sdk/deprecated/list.js
-lib/tor-browser/modules/commonjs/sdk/deprecated/memory.js
-lib/tor-browser/modules/commonjs/sdk/deprecated/symbiont.js
lib/tor-browser/modules/commonjs/sdk/deprecated/sync-worker.js
-lib/tor-browser/modules/commonjs/sdk/deprecated/traits-worker.js
-lib/tor-browser/modules/commonjs/sdk/deprecated/traits.js
-lib/tor-browser/modules/commonjs/sdk/deprecated/traits/core.js
lib/tor-browser/modules/commonjs/sdk/deprecated/unit-test-finder.js
lib/tor-browser/modules/commonjs/sdk/deprecated/unit-test.js
lib/tor-browser/modules/commonjs/sdk/deprecated/window-utils.js
+lib/tor-browser/modules/commonjs/sdk/dom/events-shimmed.js
lib/tor-browser/modules/commonjs/sdk/dom/events.js
lib/tor-browser/modules/commonjs/sdk/dom/events/keys.js
lib/tor-browser/modules/commonjs/sdk/event/chrome.js
@@ -2879,10 +3368,8 @@ lib/tor-browser/modules/commonjs/sdk/input/browser.js
lib/tor-browser/modules/commonjs/sdk/input/customizable-ui.js
lib/tor-browser/modules/commonjs/sdk/input/frame.js
lib/tor-browser/modules/commonjs/sdk/input/system.js
-lib/tor-browser/modules/commonjs/sdk/input/window.js
lib/tor-browser/modules/commonjs/sdk/io/buffer.js
lib/tor-browser/modules/commonjs/sdk/io/byte-streams.js
-lib/tor-browser/modules/commonjs/sdk/io/data.js
lib/tor-browser/modules/commonjs/sdk/io/file.js
lib/tor-browser/modules/commonjs/sdk/io/fs.js
lib/tor-browser/modules/commonjs/sdk/io/stream.js
@@ -2938,6 +3425,10 @@ lib/tor-browser/modules/commonjs/sdk/preferences/utils.js
lib/tor-browser/modules/commonjs/sdk/private-browsing.js
lib/tor-browser/modules/commonjs/sdk/private-browsing/utils.js
lib/tor-browser/modules/commonjs/sdk/querystring.js
+lib/tor-browser/modules/commonjs/sdk/remote/child.js
+lib/tor-browser/modules/commonjs/sdk/remote/core.js
+lib/tor-browser/modules/commonjs/sdk/remote/parent.js
+lib/tor-browser/modules/commonjs/sdk/remote/utils.js
lib/tor-browser/modules/commonjs/sdk/request.js
lib/tor-browser/modules/commonjs/sdk/selection.js
lib/tor-browser/modules/commonjs/sdk/self.js
@@ -2951,6 +3442,7 @@ lib/tor-browser/modules/commonjs/sdk/system/child_process/subprocess.js
lib/tor-browser/modules/commonjs/sdk/system/child_process/subprocess_worker_unix.js
lib/tor-browser/modules/commonjs/sdk/system/child_process/subprocess_worker_win.js
lib/tor-browser/modules/commonjs/sdk/system/environment.js
+lib/tor-browser/modules/commonjs/sdk/system/events-shimmed.js
lib/tor-browser/modules/commonjs/sdk/system/events.js
lib/tor-browser/modules/commonjs/sdk/system/globals.js
lib/tor-browser/modules/commonjs/sdk/system/process.js
@@ -2979,7 +3471,6 @@ lib/tor-browser/modules/commonjs/sdk/test/loader.js
lib/tor-browser/modules/commonjs/sdk/test/memory.js
lib/tor-browser/modules/commonjs/sdk/test/options.js
lib/tor-browser/modules/commonjs/sdk/test/runner.js
-lib/tor-browser/modules/commonjs/sdk/test/tmp-file.js
lib/tor-browser/modules/commonjs/sdk/test/utils.js
lib/tor-browser/modules/commonjs/sdk/timers.js
lib/tor-browser/modules/commonjs/sdk/ui.js
@@ -3009,7 +3500,6 @@ lib/tor-browser/modules/commonjs/sdk/uri/resource.js
lib/tor-browser/modules/commonjs/sdk/url.js
lib/tor-browser/modules/commonjs/sdk/url/utils.js
lib/tor-browser/modules/commonjs/sdk/util/array.js
-lib/tor-browser/modules/commonjs/sdk/util/bond.js
lib/tor-browser/modules/commonjs/sdk/util/collection.js
lib/tor-browser/modules/commonjs/sdk/util/contract.js
lib/tor-browser/modules/commonjs/sdk/util/deprecate.js
@@ -3021,19 +3511,16 @@ lib/tor-browser/modules/commonjs/sdk/util/rules.js
lib/tor-browser/modules/commonjs/sdk/util/sequence.js
lib/tor-browser/modules/commonjs/sdk/util/uuid.js
lib/tor-browser/modules/commonjs/sdk/view/core.js
-lib/tor-browser/modules/commonjs/sdk/widget.js
lib/tor-browser/modules/commonjs/sdk/window/browser.js
lib/tor-browser/modules/commonjs/sdk/window/events.js
lib/tor-browser/modules/commonjs/sdk/window/helpers.js
lib/tor-browser/modules/commonjs/sdk/window/namespace.js
lib/tor-browser/modules/commonjs/sdk/window/utils.js
lib/tor-browser/modules/commonjs/sdk/windows.js
-lib/tor-browser/modules/commonjs/sdk/windows/dom.js
lib/tor-browser/modules/commonjs/sdk/windows/fennec.js
lib/tor-browser/modules/commonjs/sdk/windows/firefox.js
lib/tor-browser/modules/commonjs/sdk/windows/observer.js
lib/tor-browser/modules/commonjs/sdk/windows/tabs-fennec.js
-lib/tor-browser/modules/commonjs/sdk/windows/tabs-firefox.js
lib/tor-browser/modules/commonjs/sdk/worker/utils.js
lib/tor-browser/modules/commonjs/sdk/zip/utils.js
lib/tor-browser/modules/commonjs/test.js
@@ -3042,205 +3529,14 @@ lib/tor-browser/modules/commonjs/toolkit/require.js
lib/tor-browser/modules/ctypes.jsm
lib/tor-browser/modules/debug.js
lib/tor-browser/modules/devtools/Console.jsm
-lib/tor-browser/modules/devtools/DevToolsUtils.js
-lib/tor-browser/modules/devtools/DevToolsUtils.jsm
-lib/tor-browser/modules/devtools/Devices.jsm
-lib/tor-browser/modules/devtools/LayoutHelpers.jsm
lib/tor-browser/modules/devtools/Loader.jsm
-lib/tor-browser/modules/devtools/Require.jsm
lib/tor-browser/modules/devtools/Simulator.jsm
-lib/tor-browser/modules/devtools/SourceMap.jsm
-lib/tor-browser/modules/devtools/Templater.jsm
-lib/tor-browser/modules/devtools/acorn/acorn.js
-lib/tor-browser/modules/devtools/acorn/acorn_loose.js
-lib/tor-browser/modules/devtools/acorn/walk.js
-lib/tor-browser/modules/devtools/app-actor-front.js
-lib/tor-browser/modules/devtools/async-utils.js
-lib/tor-browser/modules/devtools/client/connection-manager.js
-lib/tor-browser/modules/devtools/content-observer.js
-lib/tor-browser/modules/devtools/content-server.jsm
-lib/tor-browser/modules/devtools/css-color.js
lib/tor-browser/modules/devtools/dbg-client.jsm
lib/tor-browser/modules/devtools/dbg-server.jsm
-lib/tor-browser/modules/devtools/deprecated-sync-thenables.js
-lib/tor-browser/modules/devtools/discovery/discovery.js
lib/tor-browser/modules/devtools/event-emitter.js
-lib/tor-browser/modules/devtools/event-parsers.js
-lib/tor-browser/modules/devtools/gcli.jsm
-lib/tor-browser/modules/devtools/gcli/api.js
-lib/tor-browser/modules/devtools/gcli/cli.js
-lib/tor-browser/modules/devtools/gcli/commands/addon.js
-lib/tor-browser/modules/devtools/gcli/commands/appcache.js
-lib/tor-browser/modules/devtools/gcli/commands/calllog.js
-lib/tor-browser/modules/devtools/gcli/commands/clear.js
-lib/tor-browser/modules/devtools/gcli/commands/cmd.js
-lib/tor-browser/modules/devtools/gcli/commands/commands.js
-lib/tor-browser/modules/devtools/gcli/commands/connect.js
-lib/tor-browser/modules/devtools/gcli/commands/context.js
-lib/tor-browser/modules/devtools/gcli/commands/cookie.js
-lib/tor-browser/modules/devtools/gcli/commands/csscoverage.js
-lib/tor-browser/modules/devtools/gcli/commands/exec.js
-lib/tor-browser/modules/devtools/gcli/commands/folder.js
-lib/tor-browser/modules/devtools/gcli/commands/global.js
-lib/tor-browser/modules/devtools/gcli/commands/help.js
-lib/tor-browser/modules/devtools/gcli/commands/highlight.js
-lib/tor-browser/modules/devtools/gcli/commands/inject.js
-lib/tor-browser/modules/devtools/gcli/commands/intro.js
-lib/tor-browser/modules/devtools/gcli/commands/jsb.js
-lib/tor-browser/modules/devtools/gcli/commands/lang.js
-lib/tor-browser/modules/devtools/gcli/commands/listen.js
-lib/tor-browser/modules/devtools/gcli/commands/media.js
-lib/tor-browser/modules/devtools/gcli/commands/mocks.js
-lib/tor-browser/modules/devtools/gcli/commands/pagemod.js
-lib/tor-browser/modules/devtools/gcli/commands/paintflashing.js
-lib/tor-browser/modules/devtools/gcli/commands/pref.js
-lib/tor-browser/modules/devtools/gcli/commands/preflist.js
-lib/tor-browser/modules/devtools/gcli/commands/restart.js
-lib/tor-browser/modules/devtools/gcli/commands/screenshot.js
-lib/tor-browser/modules/devtools/gcli/commands/test.js
-lib/tor-browser/modules/devtools/gcli/commands/tools.js
-lib/tor-browser/modules/devtools/gcli/connectors/connectors.js
-lib/tor-browser/modules/devtools/gcli/connectors/index.js
-lib/tor-browser/modules/devtools/gcli/connectors/protocol.js
-lib/tor-browser/modules/devtools/gcli/connectors/rdp.js
-lib/tor-browser/modules/devtools/gcli/connectors/remoted.js
-lib/tor-browser/modules/devtools/gcli/converters/basic.js
-lib/tor-browser/modules/devtools/gcli/converters/converters.js
-lib/tor-browser/modules/devtools/gcli/converters/html.js
-lib/tor-browser/modules/devtools/gcli/converters/terminal.js
-lib/tor-browser/modules/devtools/gcli/fields/delegate.js
-lib/tor-browser/modules/devtools/gcli/fields/fields.js
-lib/tor-browser/modules/devtools/gcli/fields/selection.js
-lib/tor-browser/modules/devtools/gcli/index.js
-lib/tor-browser/modules/devtools/gcli/l10n.js
-lib/tor-browser/modules/devtools/gcli/languages/command.html
-lib/tor-browser/modules/devtools/gcli/languages/command.js
-lib/tor-browser/modules/devtools/gcli/languages/javascript.js
-lib/tor-browser/modules/devtools/gcli/languages/languages.js
-lib/tor-browser/modules/devtools/gcli/mozui/completer.js
-lib/tor-browser/modules/devtools/gcli/mozui/ffdisplay.js
-lib/tor-browser/modules/devtools/gcli/mozui/inputter.js
-lib/tor-browser/modules/devtools/gcli/mozui/tooltip.js
-lib/tor-browser/modules/devtools/gcli/settings.js
-lib/tor-browser/modules/devtools/gcli/types/array.js
-lib/tor-browser/modules/devtools/gcli/types/boolean.js
-lib/tor-browser/modules/devtools/gcli/types/command.js
-lib/tor-browser/modules/devtools/gcli/types/date.js
-lib/tor-browser/modules/devtools/gcli/types/delegate.js
-lib/tor-browser/modules/devtools/gcli/types/file.js
-lib/tor-browser/modules/devtools/gcli/types/fileparser.js
-lib/tor-browser/modules/devtools/gcli/types/javascript.js
-lib/tor-browser/modules/devtools/gcli/types/node.js
-lib/tor-browser/modules/devtools/gcli/types/number.js
-lib/tor-browser/modules/devtools/gcli/types/resource.js
-lib/tor-browser/modules/devtools/gcli/types/selection.js
-lib/tor-browser/modules/devtools/gcli/types/setting.js
-lib/tor-browser/modules/devtools/gcli/types/string.js
-lib/tor-browser/modules/devtools/gcli/types/types.js
-lib/tor-browser/modules/devtools/gcli/types/union.js
-lib/tor-browser/modules/devtools/gcli/types/url.js
-lib/tor-browser/modules/devtools/gcli/ui/focus.js
-lib/tor-browser/modules/devtools/gcli/ui/history.js
-lib/tor-browser/modules/devtools/gcli/ui/intro.js
-lib/tor-browser/modules/devtools/gcli/ui/menu.css
-lib/tor-browser/modules/devtools/gcli/ui/menu.html
-lib/tor-browser/modules/devtools/gcli/ui/menu.js
-lib/tor-browser/modules/devtools/gcli/ui/view.js
-lib/tor-browser/modules/devtools/gcli/util/domtemplate.js
-lib/tor-browser/modules/devtools/gcli/util/fileparser.js
-lib/tor-browser/modules/devtools/gcli/util/filesystem.js
-lib/tor-browser/modules/devtools/gcli/util/host.js
-lib/tor-browser/modules/devtools/gcli/util/l10n.js
-lib/tor-browser/modules/devtools/gcli/util/legacy.js
-lib/tor-browser/modules/devtools/gcli/util/prism.js
-lib/tor-browser/modules/devtools/gcli/util/promise.js
-lib/tor-browser/modules/devtools/gcli/util/spell.js
-lib/tor-browser/modules/devtools/gcli/util/util.js
-lib/tor-browser/modules/devtools/jsbeautify/beautify-css.js
-lib/tor-browser/modules/devtools/jsbeautify/beautify-html.js
-lib/tor-browser/modules/devtools/jsbeautify/beautify-js.js
-lib/tor-browser/modules/devtools/jsbeautify/beautify-tests.js
-lib/tor-browser/modules/devtools/jsbeautify/beautify.js
-lib/tor-browser/modules/devtools/jsbeautify/sanitytest.js
-lib/tor-browser/modules/devtools/jsbeautify/urlencode_unpacker.js
-lib/tor-browser/modules/devtools/output-parser.js
-lib/tor-browser/modules/devtools/path.js
-lib/tor-browser/modules/devtools/pretty-fast.js
-lib/tor-browser/modules/devtools/qrcode/decoder/index.js
-lib/tor-browser/modules/devtools/qrcode/encoder/index.js
-lib/tor-browser/modules/devtools/qrcode/index.js
-lib/tor-browser/modules/devtools/security/auth.js
-lib/tor-browser/modules/devtools/security/cert.js
-lib/tor-browser/modules/devtools/security/prompt.js
-lib/tor-browser/modules/devtools/security/socket.js
-lib/tor-browser/modules/devtools/server/actors/actor-registry.js
-lib/tor-browser/modules/devtools/server/actors/animation.js
-lib/tor-browser/modules/devtools/server/actors/call-watcher.js
-lib/tor-browser/modules/devtools/server/actors/canvas.js
-lib/tor-browser/modules/devtools/server/actors/child-process.js
-lib/tor-browser/modules/devtools/server/actors/childtab.js
-lib/tor-browser/modules/devtools/server/actors/common.js
-lib/tor-browser/modules/devtools/server/actors/csscoverage.js
-lib/tor-browser/modules/devtools/server/actors/device.js
-lib/tor-browser/modules/devtools/server/actors/director-manager.js
-lib/tor-browser/modules/devtools/server/actors/director-registry.js
-lib/tor-browser/modules/devtools/server/actors/eventlooplag.js
-lib/tor-browser/modules/devtools/server/actors/framerate.js
-lib/tor-browser/modules/devtools/server/actors/gcli.js
-lib/tor-browser/modules/devtools/server/actors/highlighter.css
-lib/tor-browser/modules/devtools/server/actors/highlighter.js
-lib/tor-browser/modules/devtools/server/actors/inspector.js
-lib/tor-browser/modules/devtools/server/actors/layout.js
-lib/tor-browser/modules/devtools/server/actors/memory.js
-lib/tor-browser/modules/devtools/server/actors/monitor.js
-lib/tor-browser/modules/devtools/server/actors/preference.js
-lib/tor-browser/modules/devtools/server/actors/pretty-print-worker.js
-lib/tor-browser/modules/devtools/server/actors/profiler.js
-lib/tor-browser/modules/devtools/server/actors/root.js
-lib/tor-browser/modules/devtools/server/actors/script.js
-lib/tor-browser/modules/devtools/server/actors/settings.js
-lib/tor-browser/modules/devtools/server/actors/storage.js
-lib/tor-browser/modules/devtools/server/actors/string.js
-lib/tor-browser/modules/devtools/server/actors/styleeditor.js
-lib/tor-browser/modules/devtools/server/actors/styles.js
-lib/tor-browser/modules/devtools/server/actors/stylesheets.js
-lib/tor-browser/modules/devtools/server/actors/timeline.js
-lib/tor-browser/modules/devtools/server/actors/tracer.js
-lib/tor-browser/modules/devtools/server/actors/utils/ScriptStore.js
-lib/tor-browser/modules/devtools/server/actors/utils/actor-registry-utils.js
-lib/tor-browser/modules/devtools/server/actors/utils/automation-timeline.js
-lib/tor-browser/modules/devtools/server/actors/utils/make-debugger.js
-lib/tor-browser/modules/devtools/server/actors/utils/map-uri-to-addon-id.js
-lib/tor-browser/modules/devtools/server/actors/utils/stack.js
-lib/tor-browser/modules/devtools/server/actors/webapps.js
-lib/tor-browser/modules/devtools/server/actors/webaudio.js
-lib/tor-browser/modules/devtools/server/actors/webbrowser.js
-lib/tor-browser/modules/devtools/server/actors/webconsole.js
-lib/tor-browser/modules/devtools/server/actors/webgl.js
-lib/tor-browser/modules/devtools/server/child.js
-lib/tor-browser/modules/devtools/server/content-globals.js
-lib/tor-browser/modules/devtools/server/main.js
-lib/tor-browser/modules/devtools/server/protocol.js
-lib/tor-browser/modules/devtools/shared/async-storage.js
-lib/tor-browser/modules/devtools/source-map.js
-lib/tor-browser/modules/devtools/styleinspector/css-logic.js
-lib/tor-browser/modules/devtools/tern/browser.js
-lib/tor-browser/modules/devtools/tern/comment.js
-lib/tor-browser/modules/devtools/tern/condense.js
-lib/tor-browser/modules/devtools/tern/def.js
-lib/tor-browser/modules/devtools/tern/ecma5.js
-lib/tor-browser/modules/devtools/tern/infer.js
-lib/tor-browser/modules/devtools/tern/signal.js
-lib/tor-browser/modules/devtools/tern/tern.js
-lib/tor-browser/modules/devtools/toolkit/webconsole/client.js
-lib/tor-browser/modules/devtools/toolkit/webconsole/network-helper.js
-lib/tor-browser/modules/devtools/toolkit/webconsole/network-monitor.js
-lib/tor-browser/modules/devtools/toolkit/webconsole/utils.js
-lib/tor-browser/modules/devtools/touch-events.js
-lib/tor-browser/modules/devtools/transport/packets.js
-lib/tor-browser/modules/devtools/transport/stream-utils.js
-lib/tor-browser/modules/devtools/transport/transport.js
-lib/tor-browser/modules/devtools/worker-loader.js
+lib/tor-browser/modules/devtools/shared/Console.jsm
+lib/tor-browser/modules/devtools/shared/Loader.jsm
+lib/tor-browser/modules/devtools/shared/apps/Simulator.jsm
lib/tor-browser/modules/identity/FirefoxAccounts.jsm
lib/tor-browser/modules/identity/Identity.jsm
lib/tor-browser/modules/identity/IdentityProvider.jsm
@@ -3252,6 +3548,8 @@ lib/tor-browser/modules/identity/RelyingParty.jsm
lib/tor-browser/modules/identity/Sandbox.jsm
lib/tor-browser/modules/identity/jwcrypto.jsm
lib/tor-browser/modules/jsdebugger.jsm
+lib/tor-browser/modules/lz4.js
+lib/tor-browser/modules/lz4_internal.js
lib/tor-browser/modules/mcc_iso3166_table.jsm
lib/tor-browser/modules/media/IdpSandbox.jsm
lib/tor-browser/modules/media/PeerConnectionIdp.jsm
@@ -3284,15 +3582,16 @@ lib/tor-browser/modules/services-common/bagheeraclient.js
lib/tor-browser/modules/services-common/hawkclient.js
lib/tor-browser/modules/services-common/hawkrequest.js
lib/tor-browser/modules/services-common/logmanager.js
+lib/tor-browser/modules/services-common/moz-kinto-client.js
lib/tor-browser/modules/services-common/observers.js
lib/tor-browser/modules/services-common/rest.js
-lib/tor-browser/modules/services-common/storageservice.js
lib/tor-browser/modules/services-common/stringbundle.js
lib/tor-browser/modules/services-common/tokenserverclient.js
lib/tor-browser/modules/services-common/utils.js
lib/tor-browser/modules/services-crypto/WeaveCrypto.js
lib/tor-browser/modules/services-crypto/utils.js
lib/tor-browser/modules/services-sync/FxaMigrator.jsm
+lib/tor-browser/modules/services-sync/SyncedTabs.jsm
lib/tor-browser/modules/services-sync/addonsreconciler.js
lib/tor-browser/modules/services-sync/addonutils.js
lib/tor-browser/modules/services-sync/browserid_identity.js
@@ -3311,7 +3610,6 @@ lib/tor-browser/modules/services-sync/identity.js
lib/tor-browser/modules/services-sync/jpakeclient.js
lib/tor-browser/modules/services-sync/keys.js
lib/tor-browser/modules/services-sync/main.js
-lib/tor-browser/modules/services-sync/notifications.js
lib/tor-browser/modules/services-sync/policies.js
lib/tor-browser/modules/services-sync/record.js
lib/tor-browser/modules/services-sync/resource.js
@@ -3324,7 +3622,6 @@ lib/tor-browser/modules/services-sync/status.js
lib/tor-browser/modules/services-sync/userapi.js
lib/tor-browser/modules/services-sync/util.js
lib/tor-browser/modules/services/datareporting/policy.jsm
-lib/tor-browser/modules/services/datareporting/sessions.jsm
lib/tor-browser/modules/services/healthreport/healthreporter.jsm
lib/tor-browser/modules/services/healthreport/profile.jsm
lib/tor-browser/modules/services/healthreport/providers.jsm
@@ -3334,8 +3631,6 @@ lib/tor-browser/modules/services/metrics/storage.jsm
lib/tor-browser/modules/sqlite/sqlite_internal.js
lib/tor-browser/modules/vtt.jsm
lib/tor-browser/modules/workers/PromiseWorker.js
-lib/tor-browser/modules/workers/lz4.js
-lib/tor-browser/modules/workers/lz4_internal.js
lib/tor-browser/modules/workers/require.js
lib/tor-browser/platform.ini
lib/tor-browser/plugin-container
@@ -3344,19 +3639,27 @@ lib/tor-browser/res/EditorOverride.css
lib/tor-browser/res/ImageDocument.css
lib/tor-browser/res/TopLevelImageDocument.css
lib/tor-browser/res/TopLevelVideoDocument.css
+lib/tor-browser/res/accessiblecaret.png
+lib/tor-browser/res/accessiblecaret@1.5x.png
+lib/tor-browser/res/accessiblecaret@2.25x.png
+lib/tor-browser/res/accessiblecaret@2x.png
+lib/tor-browser/res/accessiblecaret_tilt_left.png
+lib/tor-browser/res/accessiblecaret_tilt_left@1.5x.png
+lib/tor-browser/res/accessiblecaret_tilt_left@2.25x.png
+lib/tor-browser/res/accessiblecaret_tilt_left@2x.png
+lib/tor-browser/res/accessiblecaret_tilt_right.png
+lib/tor-browser/res/accessiblecaret_tilt_right@1.5x.png
+lib/tor-browser/res/accessiblecaret_tilt_right@2.25x.png
+lib/tor-browser/res/accessiblecaret_tilt_right@2x.png
lib/tor-browser/res/contenteditable.css
lib/tor-browser/res/designmode.css
lib/tor-browser/res/dtd/htmlmathml-f.ent
lib/tor-browser/res/entityTables/html40Latin1.properties
lib/tor-browser/res/entityTables/html40Special.properties
lib/tor-browser/res/entityTables/html40Symbols.properties
-lib/tor-browser/res/entityTables/htmlEntityVersions.properties
lib/tor-browser/res/entityTables/mathml20.properties
-lib/tor-browser/res/entityTables/transliterate.properties
lib/tor-browser/res/fonts/mathfont.properties
-lib/tor-browser/res/fonts/mathfontMathJax_Main.properties
lib/tor-browser/res/fonts/mathfontSTIXGeneral.properties
-lib/tor-browser/res/fonts/mathfontStandardSymbolsL.properties
lib/tor-browser/res/fonts/mathfontUnicode.properties
lib/tor-browser/res/grabber.gif
lib/tor-browser/res/html/folder.png
@@ -3380,6 +3683,18 @@ lib/tor-browser/res/table-remove-column.gif
lib/tor-browser/res/table-remove-row-active.gif
lib/tor-browser/res/table-remove-row-hover.gif
lib/tor-browser/res/table-remove-row.gif
+lib/tor-browser/res/text_caret.png
+lib/tor-browser/res/text_caret@1.5x.png
+lib/tor-browser/res/text_caret@2.25x.png
+lib/tor-browser/res/text_caret@2x.png
+lib/tor-browser/res/text_caret_tilt_left.png
+lib/tor-browser/res/text_caret_tilt_left@1.5x.png
+lib/tor-browser/res/text_caret_tilt_left@2.25x.png
+lib/tor-browser/res/text_caret_tilt_left@2x.png
+lib/tor-browser/res/text_caret_tilt_right.png
+lib/tor-browser/res/text_caret_tilt_right@1.5x.png
+lib/tor-browser/res/text_caret_tilt_right@2.25x.png
+lib/tor-browser/res/text_caret_tilt_right@2x.png
lib/tor-browser/run-mozilla.sh
lib/tor-browser/webapprt-stub
lib/tor-browser/webapprt/chrome.manifest
@@ -3390,7 +3705,6 @@ lib/tor-browser/webapprt/chrome/en-US/locale/webapprt/downloads/downloads.dtd
lib/tor-browser/webapprt/chrome/en-US/locale/webapprt/getUserMediaDialog.dtd
lib/tor-browser/webapprt/chrome/en-US/locale/webapprt/webapp.dtd
lib/tor-browser/webapprt/chrome/en-US/locale/webapprt/webapp.properties
-lib/tor-browser/webapprt/chrome/webapprt/content/dbg-webapp-actors.js
lib/tor-browser/webapprt/chrome/webapprt/content/downloads/download.xml
lib/tor-browser/webapprt/chrome/webapprt/content/downloads/downloads.css
lib/tor-browser/webapprt/chrome/webapprt/content/downloads/downloads.js
@@ -3412,7 +3726,6 @@ lib/tor-browser/webapprt/components/PaymentUIGlue.js
lib/tor-browser/webapprt/components/components.manifest
lib/tor-browser/webapprt/defaults/preferences/prefs.js
lib/tor-browser/webapprt/modules/DownloadView.jsm
-lib/tor-browser/webapprt/modules/RemoteDebugger.jsm
lib/tor-browser/webapprt/modules/Startup.jsm
lib/tor-browser/webapprt/modules/WebRTCHandler.jsm
lib/tor-browser/webapprt/modules/WebappManager.jsm
diff --git a/security/tor-browser/distinfo b/security/tor-browser/distinfo
index cc4cc513ead..8cc097ea950 100644
--- a/security/tor-browser/distinfo
+++ b/security/tor-browser/distinfo
@@ -1,165 +1,137 @@
-$NetBSD: distinfo,v 1.4 2016/04/04 17:36:34 joerg Exp $
+$NetBSD: distinfo,v 1.5 2017/01/22 12:27:21 ryoon Exp $
-SHA1 (tor-browser-38.7.1esr-5.5-1.tar.xz) = 332d04fc222f9d0778341284736c6da0f61e4607
-RMD160 (tor-browser-38.7.1esr-5.5-1.tar.xz) = c57cbdbb0a4a5f0ca8f9963daa4075bbcd754f2e
-SHA512 (tor-browser-38.7.1esr-5.5-1.tar.xz) = d2d68de30c58a0d90063ec42ee6c76ea044c5c570471e0a0765dd92057f571f52262e47629381a5b24adad610ee360ab291e3a7dd21bf41fef063c6948f413c8
-Size (tor-browser-38.7.1esr-5.5-1.tar.xz) = 150066780 bytes
-SHA1 (patch-aa) = e9e8400fa86ae8d6910b49e3a98127122e714f1a
-SHA1 (patch-accessible_atk_Platform.cpp) = c2deb81b300de44c4500328589185bbd4b6b02fb
-SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5
-SHA1 (patch-ao) = d904b04bf6b216f02390aa3483c7ef8c5a1297dd
-SHA1 (patch-as) = 6630ac63a5b0169c47dbc91bdabf7602e3979a8a
-SHA1 (patch-b2g_installer_Makefile.in) = 95eb82774734db093c990919ba669d4666e55df0
-SHA1 (patch-b2g_installer_package-manifest.in) = cdb43eece164b43b49a9c0f1a47de4e7db56ed76
+SHA1 (tor-browser/v6.0.8-esr45.6.0.tar.gz) = c0ece77e3965ec8d0e467ef82af1c4489cf556e6
+RMD160 (tor-browser/v6.0.8-esr45.6.0.tar.gz) = 5a2f87d766c9ef36035f33e1de5ea2df4aac44d2
+SHA512 (tor-browser/v6.0.8-esr45.6.0.tar.gz) = 21d47fa1288b55eb2b7b491d6790f55311322175c75cbcc0dc234daf0bd1ac77eccf9ebea0326fa40754e446da11045b8f759603dd9e19cd66195d59cfde7347
+Size (tor-browser/v6.0.8-esr45.6.0.tar.gz) = 256614669 bytes
+SHA1 (patch-aa) = 68d9a1e69706ff4089cac06902791fc1889d0ff5
+SHA1 (patch-ao) = f4244b8e3d89743cb97395913e8916f7121c172e
+SHA1 (patch-as) = d5d7f8250a9cd462f25d529c2a79c59a1bba9db2
SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756
-SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25
-SHA1 (patch-browser_app_nsBrowserApp.cpp) = b7dd345b88dd03716f725c790364d06475aaf6bb
-SHA1 (patch-browser_installer_package-manifest.in) = aee56636fc83ea6441c5303ef0297971b41516d1
+SHA1 (patch-browser_installer_package-manifest.in) = 7c4f1822cd78a5ed465b954f4b62514c64ad7b84
SHA1 (patch-build_autoconf_compiler-opts.m4) = ccdc06a2b07b7664f9cb91bcc4fb29052dda8b07
SHA1 (patch-build_autoconf_nss.m4) = 970fcd9aeede2347651c516d5211c4555dd28a4d
SHA1 (patch-build_gyp.mozbuild) = 201715e30e20090e9a9ef54cb981d283c9aabf8f
SHA1 (patch-build_pgo_profileserver.py) = 8666187258e47c037f2065a19a5b38946fdc0f6c
SHA1 (patch-config_Makefile.in) = 0a072de112e0e5cc4b929a7094498fcf003e27b3
-SHA1 (patch-config_baseconfig.mk) = 07c295fbfbaeb969b336def32d8924729e332075
-SHA1 (patch-config_external_moz.build) = ee5fe1672333a7d71e61a23f3739ffefcca692d5
+SHA1 (patch-config_baseconfig.mk) = b8e8d46be72d381f7b95b62b9c0778e98954a888
+SHA1 (patch-config_external_moz.build) = fa4f350b077f5c4a1d7a07d123c635bd9c7f1f75
SHA1 (patch-config_rules.mk) = d7f7060b246092eae3d7a792e43b14e462a37abd
SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1
SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b
-SHA1 (patch-config_system-headers) = c9ac68ecbe1ce74e1aa62d792541955c31797f2d
+SHA1 (patch-config_system-headers) = a87a47454da13791bd0158ba6c8431164c1fb1b4
+SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
+SHA1 (patch-dom_base_DOMRequest.cpp) = b934991e8ad03c3785e4c7d197b42f697571ec09
SHA1 (patch-dom_base_moz.build) = 8b59c33958b7037c4c051742c64f1455096ced46
-SHA1 (patch-dom_events_MessageEvent.h) = c7caec0955a7cff777ef84599fe9a6eec7c78a66
-SHA1 (patch-dom_media_AudioStream.h) = 96b5a1a2b1c930cfcfa77a125d47b6eb93fac1c6
SHA1 (patch-dom_media_gstreamer_GStreamerAllocator.cpp) = 4685a646a76282619d7c42fac43500e0065f067d
SHA1 (patch-dom_media_moz.build) = a89695c9557f59e00b42c60742f27a82de0f77fb
SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 6219ce1b3f2893c1d53453fcb5568d081b72e106
SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 0a7f3167e939822013ae6195406657453578453e
SHA1 (patch-dom_plugins_ipc_PluginProcessChild.cpp) = 0d10aa4c913d431fb8fa5f995f6e40cb364f069e
-SHA1 (patch-dom_system_OSFileConstants.cpp) = 4fe5d4ecf6116c7163ee6d2322db8b1b783fe5ec
-SHA1 (patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp) = 747354373bcaf2c76bdff71677f354d47837704b
+SHA1 (patch-dom_system_OSFileConstants.cpp) = 78d66c5ef615e5464a1003bcc817388102333200
+SHA1 (patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp) = 376a4197f665ede1c27be19ac2618533655a63f1
+SHA1 (patch-gfx_cairo_libpixman_src_pixman-arm-neon-asm.S) = 0379bef956f8abf2da2e059389149e133527faab
+SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 2cc997cab71a84c1f50a791693519a0626564426
SHA1 (patch-gfx_graphite2_src_Bidi.cpp) = 5e80b4a32a47ae44d237fec69ea87bdd612a76ce
-SHA1 (patch-gfx_graphite2_src_moz.build) = 1715ac0814dce4004454013b9675517152726a7a
SHA1 (patch-gfx_moz.build) = a98bda4727538f4a0f09a20b84f9dd883edaf7d9
-SHA1 (patch-gfx_skia_generate__mozbuild.py) = e0bf45842ae74f896678b1c29d97606165cf5914
-SHA1 (patch-gfx_skia_moz.build) = ce83717ec6e386d52af75a0f5592fa866b83b3bc
-SHA1 (patch-gfx_thebes_moz.build) = fa468f388322819bfa87681bf0a443fbd16568d1
+SHA1 (patch-gfx_skia_generate__mozbuild.py) = 68d690afd9092f11e17b7ec7db0987e8b6778cc5
+SHA1 (patch-gfx_skia_moz.build) = 019f502ee236c67ab3cba8c0e31591899c2c857c
+SHA1 (patch-gfx_skia_skia_src_core_SkUtilsArm.cpp) = 80283dd702be199ec7d038f4b2bb3385e0c4b482
+SHA1 (patch-gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp) = 99fad319f00a72754f3596791f353b8ab1359d2b
+SHA1 (patch-gfx_skia_skia_src_opts_memset.arm.S) = a7ecacb40b482b2713ec71af197528bbe4bea00d
+SHA1 (patch-gfx_thebes_moz.build) = bbc67642604042c8d63e6de1a02d2c62fcf16d83
SHA1 (patch-gfx_ycbcr_moz.build) = 121386ef62ff7425e6f93bc624555199f2ac3485
-SHA1 (patch-gfx_ycbcr_yuv__row__arm.S) = f9909ded72762b2c3547dd002707db43745f2b9d
-SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = ec12085f52b3614bc67b797c3a6b36ab5daee9ea
-SHA1 (patch-intl_hyphenation_hnjalloc.h) = 5b5ac622ed2dd8711f00be0af59c95ebc86a8a78
-SHA1 (patch-intl_unicharutil_util_moz.build) = 1e8eb1f6e66ed80a1689e2205a7d04efe5243d5b
-SHA1 (patch-ipc_chromium_Makefile.in) = edd85b79cd3879f7595b932442bb0e93505d5506
-SHA1 (patch-ipc_chromium_moz.build) = de12255865e45cfdf0f7dc57ce101be75ac8ad54
+SHA1 (patch-gfx_ycbcr_yuv__row__arm.S) = dc136475637d808055e710a17b16899380b59068
+SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = 522c46732d44be15411d39e16c89bc848d5c6f7a
+SHA1 (patch-intl_hyphenation_glue_hnjalloc.h) = 4d5e1ff0b7b7da4755fb1dbab1fd671478c0335c
SHA1 (patch-ipc_chromium_src_base_atomicops.h) = 24b63a6e51d9ab27f2788ee02f2ffa7e1c36f29a
-SHA1 (patch-ipc_chromium_src_base_file__util.h) = 9d6d074b1692c6b4e722bfac8d67c66040a6fa76
-SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 18096b89ac3f239a0eb7c1d9c5080c1ac2c73e1b
+SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 70772ab2a474b7d3d15cf401c636ca843cfe2034
SHA1 (patch-ipc_chromium_src_base_message__loop.cc) = 16158489773bbcba35e224d30bebace0c93599ae
+SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 2c5ce6290760e0435365dac788d283f9bb78acd9
SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = e6d7ac39a8b2a1b232638f7671e8530acfed0b97
-SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = ff1371ffb84abf2d2adcf25e66502943992d5109
+SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 6c98bbecde21b8571c71477f351488d9a3da45f3
SHA1 (patch-ipc_chromium_src_base_process__util.h) = 4b24c3467866a601d68bb83f44e5fd38fb27188d
-SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = efe1c242efded89b7a69a83429bc30843f330367
+SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = 9ffe81c7c4485bef53c4e0846b1d4499f4b5b23c
SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = 6b2611cc902f17e726aabcf4fb5fff2c71852408
SHA1 (patch-ipc_chromium_src_base_scoped__nsautorelease__pool.h) = 8c61a35e99e7f54e4b2bf5931c59eb2b7a04127a
-SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 27890c56194e483fc0758ed767ca5795cc5112eb
+SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 927f1f700c917f6f6b531aa4c10aba0fdd181195
SHA1 (patch-ipc_chromium_src_base_time__posix.cc) = 337a0b4a5d51d68c7699b79c7591b953ea23ca67
SHA1 (patch-ipc_chromium_src_build_build__config.h) = af5a10df7d8fe9715f0e43cd6be14f8f20c53517
SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = 7af18973c005d7b144a225bacf41833e059cb400
SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 45f2f22b4f567ffddd4458f635179b5201e87e64
-SHA1 (patch-ipc_glue_ScopedXREEmbed.cpp) = 97c39f25527dac4c22b38ce446ca2cd4cef08fd0
SHA1 (patch-ipc_glue_StringUtil.cpp) = f238adebb5bdf57f7109a781c6f3fb195763f3c0
-SHA1 (patch-ipc_glue_moz.build) = 2682ca9de9606e50602a124e287dded2b9f2859b
-SHA1 (patch-ipc_ipdl_ipdl_cxx_ast.py) = 047b7012dffdcfc2b07d2d249fb3523e7d4643f8
-SHA1 (patch-ipc_ipdl_ipdl_cxx_cgen.py) = d7f7dc85b1ff26c6d7e902f94c0ac09f04497105
-SHA1 (patch-ipc_ipdl_ipdl_lower.py) = 2ef9504e462d0e3db16f9b0a6303ea5971b9c2a2
+SHA1 (patch-ipc_glue_moz.build) = 5c3f99ede7ab2d8ad58e92b31576971de87cb528
SHA1 (patch-js__src__vm__SPSProfiler.cpp) = 989ba25e4c5308d21d07baa802decce13609a475
-SHA1 (patch-js_public_CallArgs.h) = fde9a73b8a694c4c7415848aa25e14ccefe547dd
-SHA1 (patch-js_src_Makefile.in) = 77d2e7cb651b9f30ebf6458fd07678416cdecbcc
-SHA1 (patch-js_src_asmjs_AsmJSSignalHandlers.cpp) = 976cc3099901d36a70cca4333fca13d5b8885b26
SHA1 (patch-js_src_ctypes_CTypes.h) = 768a084239f92a424c1c7dc9eaaf9be9456ca9f0
SHA1 (patch-js_src_frontend_ParseMaps.cpp) = c00117d79b78904bc50a1d664a8fc0e4e339bfbc
-SHA1 (patch-js_src_gc_Statistics.cpp) = 227d047f5befeff2a619e8bec9e98d69a78adf5c
-SHA1 (patch-js_src_jit-LIR.cpp) = 6c9b3bb9f2c41f7b101c49375c51418912620a15
-SHA1 (patch-js_src_jit_ExecutableAllocator.h) = c2389a7e6521905941270246adf155834703d8a0
-SHA1 (patch-js_src_jit_MIR.cpp) = d04ce1c7a55d8e1871472e1078cf591c8ea98588
-SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = ea58f199dbc11d7fcc04bbc1205d6ecf3a3ac3e0
-SHA1 (patch-js_src_jsapi.cpp) = 97aaa4eea1254b675cbfd9cfae92dd614a717f49
-SHA1 (patch-js_src_jsdate.cpp) = 0e577aefa24693c7941ead0365c58b2b4b41dc8c
+SHA1 (patch-js_src_jit-LIR.cpp) = 6e678d6886724dd346b8ca58ef903bd00dc8f5da
+SHA1 (patch-js_src_jit_MIR.cpp) = 32586fb4437b48c62ef3dd8267f4b1796196230b
+SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = d734bea22d803f5f1019fd817cd3993da29a422b
+SHA1 (patch-js_src_jsdate.cpp) = 4e15badd1d9a08462a851aa2a8c47fd1e137626b
SHA1 (patch-js_src_jskwgen.cpp) = 34d3b92e13366d4b43ff755ad54f392c116d5c59
SHA1 (patch-js_src_jsmath.cpp) = 7d4993ae91e9b5e6820358165603819aefb586f9
-SHA1 (patch-js_src_shell_jsoptparse.cpp) = 178415aa652ccbd5278629b5154d20c4d7bfffd0
+SHA1 (patch-js_src_shell_jsoptparse.cpp) = 2502ae2b4e6103788c2a888b6cb19cedf9d2976f
SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde
SHA1 (patch-js_xpconnect_src_xpcprivate.h) = 8a15ff542c9d3fce448d9ec63706f7dfb411d926
-SHA1 (patch-media_libcubeb_AUTHORS) = 3db32086f98c2bbe16e9394bb5121d7a95cdb4af
-SHA1 (patch-media_libcubeb_src_cubeb.c) = effe8771e42adddb478ecb302352ef003bdd01db
-SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = f8ab0c958e00b2ae52ac73ebcad5bf8a9fe2f2d1
+SHA1 (patch-media_libcubeb_src_cubeb.c) = 5c2a9adef2c3b8fe40490ac8062ae77d182b5e59
+SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 7394a73b1624ea525885aed524357bbd1a19138b
SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 54e2a210411c7083bc395033fbf519d581bc4a62
-SHA1 (patch-media_libcubeb_src_moz.build) = a793f0dd1bd90d9a9a967dbef8da1183cd909b7c
+SHA1 (patch-media_libcubeb_src_moz.build) = 3ed7f6e8caf8cca718cd8dcb120bc401cd9a82ef
SHA1 (patch-media_libpng_pngpriv.h) = c9cefd1b5dd85fbd0c875c3f9bc108975398fe3a
SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = db61737afa7773e8cbd82976de3a02c917174696
+SHA1 (patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h) = b280f691dbe67b6de592dcd04baf33c6cf480cc8
SHA1 (patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp) = b7c21a68f09176100794148aa75eb19829417fed
SHA1 (patch-media_libstagefright_system_core_liblog_fake__log__device.c) = b59809a7292d41bdb352bc425dc46273f1c0c270
SHA1 (patch-media_libstagefright_system_core_liblog_logprint.c) = 56c5590b57caf568e12f8ff7df07daec281855de
SHA1 (patch-media_libtheora_lib_arm_armcpu.c) = 4b215277f9c81154377d401166023c1bf78a3718
SHA1 (patch-media_libtheora_lib_info.c) = cb7628134427aaa4d5824c0e0770c30e5111a933
-SHA1 (patch-media_libtheora_moz.build) = 69476f02c0d79929b1d92719706ac68ffd102826
+SHA1 (patch-media_libtheora_moz.build) = 4d03d454e13bda8321198aeb957aaabcfb4c6512
SHA1 (patch-media_libtremor_Makefile.in) = 497d03646caa721bdd129de365aadea8466043af
SHA1 (patch-media_libtremor_moz.build) = 994b04e4c344a91c4b474a752ddc4ca0e2732910
SHA1 (patch-media_libvorbis_Makefile.in) = fd1ce15268eed9c97dd0774398d559cdbed63e53
SHA1 (patch-media_libvorbis_lib_vorbis_info.c) = 1d85195a5553202b0c38dc8dec6db1f4f0513e5f
SHA1 (patch-media_libvorbis_moz.build) = 927f7848305eb2341c9efa96800d30b4a1b8eaa4
SHA1 (patch-media_libyuv_include_libyuv_scale__row.h) = 503b6f2065e9d548a1f01f7158d65874f4886c78
-SHA1 (patch-media_mtransport_third__party_nICEr_src_util_mbslen.c) = 087e8788c72b96d2059ca82ce4282d78aed546da
+SHA1 (patch-media_mtransport_third__party_nICEr_src_util_mbslen.c) = 2e6f125ae50125a1fff7197e42f3a61b92e0fcfc
SHA1 (patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h) = de7055f891387f96f8fd32366c7189d480354e9e
-SHA1 (patch-media_webrtc_signaling_test_moz.build) = 2de45866c1c41f8a186586264fad3be90e30ba3b
+SHA1 (patch-media_openmax__dl_dl_api_armCOMM__s.h) = 1ce4fe73581ea53f03858f97ce7d7214bcbb5f51
+SHA1 (patch-media_webrtc_signaling_test_common.build) = febf2033154d64208632524732c4ef26e9247267
SHA1 (patch-media_webrtc_trunk_webrtc_build_common.gypi) = 4ff5796e15d9aa6adb8495d6f2e5a7f0445a0fac
-SHA1 (patch-media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi) = e47f1c64c0455f1b31011bf90346645a4ce38e52
SHA1 (patch-media_webrtc_trunk_webrtc_modules_audio__coding_neteq_neteq.gypi) = 54c05a12758c377b0f80143048280a7738e7038d
SHA1 (patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.cc) = 53481a80b410afe962146f08eafe8ff38ac6a241
SHA1 (patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.h) = b972e59204760eb885a9a0432ec977f604208a53
SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 9ff1dcf200feaf67bf576f07beb612e0ec91d7d1
-SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = ffc1d956e826a0005b76285596ba24a2f4a3806c
-SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = 4a293e0d788a3a3acfbbf4cf19a6f9a7235b83d0
-SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp) = c09f0d234f70d48403b3b12866647c4cbc752396
-SHA1 (patch-memory_build_mozjemalloc__compat.c) = e43a0f593a524db1b325e0b6141f2630d63b9a5c
-SHA1 (patch-memory_jemalloc_Makefile.in) = 772e996c8da254f952d0f3a0c9325a177c838543
-SHA1 (patch-memory_jemalloc_src_configure) = d1e27220b223266f7a7d362dca1621012f8d9d7f
-SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 44cb29dac1e8032c3f58149227bfe5ad94e8edb9
+SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = ee3d3421a4cec22dbd94b5a22e7b877e356a7d9c
+SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = 0bc751e73456dec547567797ef4b9199e7220f23
+SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp) = 7c08c0586874bcb69a9005e8661b853f8664db4c
+SHA1 (patch-memory_build_mozjemalloc__compat.c) = c27c745fd6e0bbb120ef34d8a984937d5f2e1319
+SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = f61a8ef233963d5d9639a4ce68e8584bc7d7c1b2
SHA1 (patch-memory_volatile_VolatileBufferOSX.cpp) = ebea8a615443206376cb4264ed43b5c74e029b7d
-SHA1 (patch-mfbt_Alignment.h) = 9ebc9892fd11eba7105974979b54f4f8759b7749
-SHA1 (patch-mfbt_Attributes.h) = b3f54a35476e99ba3191ee99feafc86de21d8334
+SHA1 (patch-mfbt_Attributes.h) = bf3378667704d7c9194b00024bb51ed23fd92286
SHA1 (patch-mfbt_Poison.cpp) = f502581db96b3e5eca25a9aa9035f436e9167503
-SHA1 (patch-mobile_android_installer_Makefile.in) = 3d6b7ea3fc6249f2f8ebc88f15f34495a0ef41d6
-SHA1 (patch-mobile_android_installer_package-manifest.in) = 5826a6585e76eecad46e8c8bf3a9c4ded61b5748
SHA1 (patch-modules_libjar_nsZipArchive.cpp) = 6aff0f8ed42575d8ca36a524e12e9a1f7351004a
-SHA1 (patch-netwerk_base_nsNetUtil.h) = e80f40b048e4628876ceb1a5ca90f7b07862d9ab
-SHA1 (patch-netwerk_dns_moz.build) = 447ea9652f67cb5e48ea14a725c4cf45647eec6b
-SHA1 (patch-netwerk_protocol_http_Http2Session.cpp) = 40f4a64657ea2dd0ddc6434cafcd181763ac31b6
+SHA1 (patch-modules_libpref_init_all.js) = fc47d4133490d3da79217864028f5a86023a632f
+SHA1 (patch-mozglue_build_arm.cpp) = e89e9ff5a26fb11b55df29a0b29d1cd6f35e46e6
+SHA1 (patch-mozglue_build_arm.h) = e303e53d1931b28aab68346c7f6caac4402d16f1
+SHA1 (patch-netwerk_dns_moz.build) = 6bf4691cf81d5f6fc1b392a4fac4368615e18faa
+SHA1 (patch-netwerk_protocol_http_Http2Session.cpp) = 7322fbf185aaf00c6caf9d6c5ceaa2600d188d47
SHA1 (patch-pb) = 97c9b2e4cefd524dc6ba825f71c3da2a761aa1f4
SHA1 (patch-pc) = 8b2baa88f0983a2fef4f801cf6b1ae425f6c813a
-SHA1 (patch-rc) = affa634564e798184bbe50ba7c491d691a4a8994
-SHA1 (patch-security_certverifier_OCSPRequestor.cpp) = 3db71730f36ce5396c7a927981654de0d01482e2
-SHA1 (patch-security_manager_ssl_src_nsNSSCallbacks.cpp) = a3f18dc7851c91768504600f1f73746d4da5ad60
-SHA1 (patch-security_manager_ssl_src_nsNSSCallbacks.h) = 82c74f042502a286d0128aa67afb3b1583a03b11
-SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = 28d216fb8dcb5968c1ff657578b4caf814c146ac
-SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__back.jsm) = 6b926ccd793391ad7bd7101635f4b3eefe3db130
-SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__front.jsm) = f5adba2137f2d7fd4d4a6a1e8ef8625866513890
+SHA1 (patch-rc) = 3bc75b2005bb1a371231846ea605bcf55251db57
+SHA1 (patch-storage_SQLiteMutex.h) = 9552e325e4e6e0f611a83a5eea2617e04236616f
+SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h) = 4b664bb6ac2c23e8bfddd406bf76e288548e8910
+SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h) = 3b0973c96eadb7bff91eab211d3c159a9b22fa9c
SHA1 (patch-toolkit_library_moz.build) = 625d78e64959f78a5d0b8148749bb43a0abcbcf7
+SHA1 (patch-toolkit_xre_glxtest.cpp) = cf048491778610454b914400e53072afedd96e7b
SHA1 (patch-toolkit_xre_nsAppRunner.cpp) = f335d64cb0e1d248fd2c41a167ee1874218e7db6
SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 6ee6fba04a3ecc6596f8aed67f752a1075901fa8
-SHA1 (patch-toolkit_xre_nsXREDirProvider.cpp) = b0e2eb1359fb30e5e5134ae76e56c98fd3d43e8f
SHA1 (patch-webapprt_moz.build) = 177468d5e12c49db1ad5376f0f3df34fa9df070c
-SHA1 (patch-widget_gtk_gtk2drawing.c) = dd63fd368a86aef1b9568ae625904ffd9542a874
-SHA1 (patch-widget_gtk_gtk3drawing.c) = 7224a3ef02ef98b6013ffeafcf6819c726bacbe6
-SHA1 (patch-widget_gtk_gtkdrawing.h) = ca582ba4f09c4a31600dcb630a7997ed5db7a7b4
-SHA1 (patch-widget_gtk_nsNativeThemeGTK.cpp) = 959ddb6501d2b3bff94ca3ff5fbdbfe8ce71879c
-SHA1 (patch-xpcom_base_nsStackWalk.cpp) = 8fb5eb1f1e548eda7151175d350eee9ec38b17b3
SHA1 (patch-xpcom_base_nscore.h) = f4fe66cc9e714a2101a4d1287359d1c300574438
SHA1 (patch-xpcom_build_PoisonIOInterposer.h) = b0a53ec580bf5c2277d19618c1240a447575ae68
-SHA1 (patch-xpcom_build_XPCOMInit.cpp) = 31a3e1b22b992d677a77d1e75ef52eb18d84abf7
-SHA1 (patch-xpcom_components_Module.h) = 7aebeb9550a4fec51c08cd678f101e836f594352
-SHA1 (patch-xpcom_glue_standalone_nsXPCOMGlue.cpp) = a6ef7f490d52037d2a72d3d52d834a182a29eccb
-SHA1 (patch-xpcom_io_nsAppFileLocationProvider.cpp) = 7d3648b5fd91a12dd61f71ae144462e36e6061db
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_Makefile.in) = 1e4d71a06b34556fa9339f97b75a065539baa511
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 2e6fbc64d78a3f035c6f9db9fffd0f1097420b58
+SHA1 (patch-xpcom_components_Module.h) = 35c5d831b0f916be4cbed18f904ab561dde72ab0
+SHA1 (patch-xpcom_io_TorFileUtils.cpp) = c646c26b60c38f5bacbf277021ab72ebb85728be
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_Makefile.in) = 6083e298140357bc5f2fa018885fed42eecb1ac4
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 4717f2a285200ccb5f580e12ffd73c51ae9e9c00
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp) = 493d1433ae72bbd0c65ab3f51de43fb864a6f58d
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S) = f310105510bb5fa6c6de122ebdebbfa18423d8d3
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s) = 8e367d4d0baf24714ee80449fc8d6849ff08ca1c
diff --git a/security/tor-browser/patches/patch-aa b/security/tor-browser/patches/patch-aa
index aa6709b3afe..c32dc91a94f 100644
--- a/security/tor-browser/patches/patch-aa
+++ b/security/tor-browser/patches/patch-aa
@@ -1,53 +1,25 @@
-$NetBSD: patch-aa,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-aa,v 1.2 2017/01/22 12:27:21 ryoon Exp $
-* The profiler does not support Darwin/PPC so don't try to enable it
- on that platform.
-
-* Cocoa gamepad backend can only be used if the toolkit is cocoa too.
-
-* The preprocessor macro XP_MACOSX is misused everywhere. They tend to
- say "#if defined(XP_MACOSX)" to actually mean
- "#if defined(MOZ_WIDGET_COCOA)". It's okay to equate XP_MACOSX with
- XP_DARWIN but equating it with MOZ_WIDGET_COCOA is just wrong. As a
- result, cairo-gtk2 build on Darwin is completely broken and needs
- heavy patching. Ideally they should be fixed individually but that
- will be an extremely hard work, so don't define XP_MACOSX for now.
-
---- configure.in.orig 2015-05-04 00:43:23.000000000 +0000
+--- configure.in.orig 2017-01-22 03:59:19.858941700 +0000
+++ configure.in
-@@ -1794,7 +1794,13 @@ Linux)
- MOZ_ENABLE_PROFILER_SPS=
- esac
- ;;
--WINNT|Darwin) ;;
-+WINNT|Darwin)
-+ case "${CPU_ARCH}" in
-+ x86 | x86_64) ;;
-+ *)
-+ MOZ_ENABLE_PROFILER_SPS=
-+ esac
-+ ;;
- *)
- MOZ_ENABLE_PROFILER_SPS=
- ;;
-@@ -1898,7 +1904,7 @@ case "$host" in
- ;;
+@@ -1746,7 +1746,7 @@ fi
+ dnl ========================================================
+ dnl SPS Profiler
+ dnl ========================================================
+-MOZ_ENABLE_PROFILER_SPS=1
++MOZ_ENABLE_PROFILER_SPS=
- *-darwin*)
-- HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
-+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
- HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
- HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
- ;;
-@@ -2022,7 +2028,6 @@ case "$target" in
- AC_DEFINE(XP_DARWIN)
+ case "${OS_TARGET}" in
+ Android)
+@@ -1996,7 +1996,6 @@ case "$target" in
_PLATFORM_DEFAULT_TOOLKIT='cairo-uikit'
+ direct_nspr_config=1
else
- AC_DEFINE(XP_MACOSX)
AC_DEFINE(XP_DARWIN)
_PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
# The ExceptionHandling framework is needed for Objective-C exception
-@@ -2641,8 +2646,7 @@ MOZ_CXX11
+@@ -2574,8 +2573,7 @@ MOZ_CXX11
AC_LANG_C
@@ -57,7 +29,7 @@ $NetBSD: patch-aa,v 1.1 2016/02/14 07:30:54 ryoon Exp $
dnl ===============================================================
if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then
AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
-@@ -3663,6 +3667,14 @@ if test -n "$YASM"; then
+@@ -3467,6 +3465,14 @@ if test -n "$YASM"; then
_YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
fi
@@ -72,7 +44,7 @@ $NetBSD: patch-aa,v 1.1 2016/02/14 07:30:54 ryoon Exp $
if test -z "$SKIP_LIBRARY_CHECKS"; then
dnl system JPEG support
dnl ========================================================
-@@ -3690,11 +3702,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
+@@ -3494,11 +3500,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
#include <jpeglib.h> ],
[ #if JPEG_LIB_VERSION < $MOZJPEG
#error "Insufficient JPEG library version ($MOZJPEG required)."
@@ -85,7 +57,7 @@ $NetBSD: patch-aa,v 1.1 2016/02/14 07:30:54 ryoon Exp $
MOZ_NATIVE_JPEG=1,
AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
fi
-@@ -4392,6 +4400,10 @@ cairo-gonk)
+@@ -4255,6 +4257,10 @@ cairo-gonk)
esac
@@ -96,16 +68,7 @@ $NetBSD: patch-aa,v 1.1 2016/02/14 07:30:54 ryoon Exp $
AC_SUBST(MOZ_PDF_PRINTING)
if test "$MOZ_PDF_PRINTING"; then
PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
-@@ -4408,7 +4420,7 @@ fi
-
- if test "$COMPILE_ENVIRONMENT"; then
- if test "$MOZ_ENABLE_GTK3"; then
-- PKG_CHECK_MODULES(MOZ_GTK3, gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 atk-bridge-2.0 $GDK_PACKAGES)
-+ PKG_CHECK_MODULES(MOZ_GTK3, gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 $GDK_PACKAGES)
- MOZ_GTK3_CFLAGS="-I${_topsrcdir}/widget/gtk/compat-gtk3 $MOZ_GTK3_CFLAGS"
- dnl Contrary to MOZ_GTK2_LIBS, MOZ_GTK3_LIBS needs to be literally added to TK_LIBS instead
- dnl of a make reference because of how TK_LIBS is mangled in toolkit/library/moz.build
-@@ -5149,6 +5161,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -5013,6 +5019,9 @@ if test -n "$MOZ_WEBRTC"; then
MOZ_VPX=1
MOZ_VPX_ERROR_CONCEALMENT=1
@@ -115,7 +78,7 @@ $NetBSD: patch-aa,v 1.1 2016/02/14 07:30:54 ryoon Exp $
dnl enable once Signaling lands
MOZ_WEBRTC_SIGNALING=1
AC_DEFINE(MOZ_WEBRTC_SIGNALING)
-@@ -5252,6 +5267,157 @@ if test "${ac_cv_c_attribute_aligned}" !
+@@ -5156,6 +5165,142 @@ if test "${ac_cv_c_attribute_aligned}" !
fi
dnl ========================================================
@@ -219,21 +182,6 @@ $NetBSD: patch-aa,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+AC_SUBST(MOZ_NATIVE_THEORA)
+
+dnl ========================================================
-+dnl Check for libspeex resampler
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-speex,
-+[ --with-system-speex Use system libspeex (located with pkgconfig)],
-+MOZ_NATIVE_SPEEX=1,
-+MOZ_NATIVE_SPEEX=)
-+
-+if test -n "$MOZ_NATIVE_SPEEX"; then
-+ PKG_CHECK_MODULES(MOZ_SPEEX, speexdsp >= 1.2)
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_SPEEX)
-+
-+dnl ========================================================
+dnl Check for libsoundtouch
+dnl ========================================================
+
@@ -273,7 +221,7 @@ $NetBSD: patch-aa,v 1.1 2016/02/14 07:30:54 ryoon Exp $
dnl = Disable VP8 decoder support
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(webm,
-@@ -5606,6 +5772,67 @@ fi
+@@ -5558,6 +5703,67 @@ fi
AC_SUBST(MOZ_WEBM_ENCODER)
dnl ==================================
@@ -282,7 +230,7 @@ $NetBSD: patch-aa,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+
+dnl If using Linux, Solaris or BSDs, ensure that OSS is available
+case "$OS_TARGET" in
-+Linux|SunOS|DragonFly|FreeBSD|NetBSD|GNU/kFreeBSD)
++Linux|SunOS|DragonFly|FreeBSD|GNU/kFreeBSD)
+ MOZ_OSS=1
+ ;;
+esac
@@ -305,7 +253,7 @@ $NetBSD: patch-aa,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+ dnl Prefer 4Front implementation
+ AC_MSG_CHECKING([MOZ_OSS_CFLAGS])
+ if test "$OSSPREFIX" != "yes"; then
-+ oss_conf=${OSSPREFIX%/usr}/etc/oss.conf
++ oss_conf=${OSSPREFIX}/etc/oss.conf
+ if test -f "$oss_conf"; then
+ . "$oss_conf"
+ else
@@ -341,7 +289,7 @@ $NetBSD: patch-aa,v 1.1 2016/02/14 07:30:54 ryoon Exp $
dnl = Check alsa availability on Linux
dnl ==================================
-@@ -5619,12 +5846,23 @@ MOZ_ARG_ENABLE_BOOL(alsa,
+@@ -5571,12 +5777,23 @@ MOZ_ARG_ENABLE_BOOL(alsa,
MOZ_ALSA=1,
MOZ_ALSA=)
@@ -365,18 +313,31 @@ $NetBSD: patch-aa,v 1.1 2016/02/14 07:30:54 ryoon Exp $
AC_SUBST(MOZ_ALSA)
dnl ========================================================
-@@ -6046,7 +6284,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad,
- if test "$MOZ_GAMEPAD"; then
- case "$OS_TARGET" in
- Darwin)
-- MOZ_GAMEPAD_BACKEND=cocoa
-+ if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
-+ MOZ_GAMEPAD_BACKEND=cocoa
-+ fi
- ;;
- WINNT)
- MOZ_GAMEPAD_BACKEND=windows
-@@ -8066,6 +8306,49 @@ if test "$USE_FC_FREETYPE"; then
+@@ -6539,12 +6756,23 @@ if test -n "$TOR_BROWSER_UPDATE"; then
+ AC_DEFINE(TOR_BROWSER_UPDATE)
+ fi
+
++MOZ_ARG_ENABLE_BOOL(tor-browser-data-in-home-dir,
++[ --enable-tor-browser-data-in-home-dir
++ Enable Tor Browser data in home dir],
++ TOR_BROWSER_DATA_IN_HOME_DIR=1,
++ TOR_BROWSER_DATA_IN_HOME_DIR= )
++
+ MOZ_ARG_ENABLE_BOOL(tor-browser-data-outside-app-dir,
+ [ --enable-tor-browser-data-outside-app-dir
+ Enable Tor Browser data outside of app directory],
+ TOR_BROWSER_DATA_OUTSIDE_APP_DIR=1,
+ TOR_BROWSER_DATA_OUTSIDE_APP_DIR= )
+
++if test -n "$TOR_BROWSER_DATA_IN_HOME_DIR"; then
++ TOR_BROWSER_DATA_OUTSIDE_APP_DIR=1
++ AC_DEFINE(TOR_BROWSER_DATA_IN_HOME_DIR)
++fi
++
+ if test -n "$TOR_BROWSER_DATA_OUTSIDE_APP_DIR"; then
+ AC_DEFINE(TOR_BROWSER_DATA_OUTSIDE_APP_DIR)
+ fi
+@@ -8170,6 +8398,49 @@ if test "$USE_FC_FREETYPE"; then
fi
dnl ========================================================
diff --git a/security/tor-browser/patches/patch-accessible_atk_Platform.cpp b/security/tor-browser/patches/patch-accessible_atk_Platform.cpp
deleted file mode 100644
index 34f93a17ac1..00000000000
--- a/security/tor-browser/patches/patch-accessible_atk_Platform.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-$NetBSD: patch-accessible_atk_Platform.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- accessible/atk/Platform.cpp.orig 2015-05-04 00:43:17.000000000 +0000
-+++ accessible/atk/Platform.cpp
-@@ -18,8 +18,9 @@
- #include <dbus/dbus.h>
- #endif
- #include <gtk/gtk.h>
-+
- #if (MOZ_WIDGET_GTK == 3)
--#include <atk-bridge.h>
-+extern "C" __attribute__((weak,visibility("default"))) int atk_bridge_adaptor_init(int*, char **[]);
- #endif
-
- using namespace mozilla;
-@@ -46,7 +47,6 @@ static gulong sToplevel_hide_hook = 0;
-
- GType g_atk_hyperlink_impl_type = G_TYPE_INVALID;
-
--#if (MOZ_WIDGET_GTK == 2)
- struct GnomeAccessibilityModule
- {
- const char *libName;
-@@ -67,11 +67,13 @@ static GnomeAccessibilityModule sAtkBrid
- "gnome_accessibility_module_shutdown", nullptr
- };
-
-+#if (MOZ_WIDGET_GTK == 2)
- static GnomeAccessibilityModule sGail = {
- "libgail.so", nullptr,
- "gnome_accessibility_module_init", nullptr,
- "gnome_accessibility_module_shutdown", nullptr
- };
-+#endif
-
- static nsresult
- LoadGtkModule(GnomeAccessibilityModule& aModule)
-@@ -98,7 +100,11 @@ LoadGtkModule(GnomeAccessibilityModule&
- else
- subLen = loc2 - loc1;
- nsAutoCString sub(Substring(libPath, loc1, subLen));
-+#if (MOZ_WIDGET_GTK == 2)
- sub.AppendLiteral("/gtk-2.0/modules/");
-+#else
-+ sub.AppendLiteral("/gtk-3.0/modules/");
-+#endif
- sub.Append(aModule.libName);
- aModule.lib = PR_LoadLibrary(sub.get());
- if (aModule.lib)
-@@ -123,7 +129,6 @@ LoadGtkModule(GnomeAccessibilityModule&
- }
- return NS_OK;
- }
--#endif // (MOZ_WIDGET_GTK == 2)
-
- void
- a11y::PlatformInit()
-@@ -175,14 +180,17 @@ a11y::PlatformInit()
-
- // Init atk-bridge now
- PR_SetEnv("NO_AT_BRIDGE=0");
--#if (MOZ_WIDGET_GTK == 2)
-- rv = LoadGtkModule(sAtkBridge);
-- if (NS_SUCCEEDED(rv)) {
-- (*sAtkBridge.init)();
-- }
--#else
-- atk_bridge_adaptor_init(nullptr, nullptr);
-+#if (MOZ_WIDGET_GTK == 3)
-+ if (atk_bridge_adaptor_init) {
-+ atk_bridge_adaptor_init(nullptr, nullptr);
-+ } else
- #endif
-+ {
-+ nsresult rv = LoadGtkModule(sAtkBridge);
-+ if (NS_SUCCEEDED(rv)) {
-+ (*sAtkBridge.init)();
-+ }
-+ }
-
- if (!sToplevel_event_hook_added) {
- sToplevel_event_hook_added = true;
-@@ -210,7 +218,6 @@ a11y::PlatformShutdown()
- sToplevel_hide_hook);
- }
-
--#if (MOZ_WIDGET_GTK == 2)
- if (sAtkBridge.lib) {
- // Do not shutdown/unload atk-bridge,
- // an exit function registered will take care of it
-@@ -221,6 +228,7 @@ a11y::PlatformShutdown()
- sAtkBridge.init = nullptr;
- sAtkBridge.shutdown = nullptr;
- }
-+#if (MOZ_WIDGET_GTK == 2)
- if (sGail.lib) {
- // Do not shutdown gail because
- // 1) Maybe it's not init-ed by us. e.g. GtkEmbed
diff --git a/security/tor-browser/patches/patch-al b/security/tor-browser/patches/patch-al
deleted file mode 100644
index d61e026668f..00000000000
--- a/security/tor-browser/patches/patch-al
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-al,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- storage/src/mozStorageConnection.cpp.orig 2014-04-18 02:04:20.000000000 +0000
-+++ storage/src/mozStorageConnection.cpp
-@@ -584,6 +584,11 @@ Connection::initialize(nsIFile *aDatabas
-
- mDatabaseFile = aDatabaseFile;
-
-+ // XXX tnn: the configure script demands that sqlite3 is compiled with
-+ // SECURE_DELETE on by default. sqlite3 in pkgsrc does not have that,
-+ // so instead we enable secure_delete manually here.
-+ (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING("PRAGMA secure_delete = 1;"));
-+
- return NS_OK;
- }
-
diff --git a/security/tor-browser/patches/patch-ao b/security/tor-browser/patches/patch-ao
index 051d1e57167..8968b7c6f6f 100644
--- a/security/tor-browser/patches/patch-ao
+++ b/security/tor-browser/patches/patch-ao
@@ -1,14 +1,16 @@
-$NetBSD: patch-ao,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-ao,v 1.2 2017/01/22 12:27:21 ryoon Exp $
---- toolkit/mozapps/installer/packager.mk.orig 2015-06-24 21:28:03.000000000 +0000
+--- toolkit/mozapps/installer/packager.mk.orig 2016-04-20 21:33:09.000000000 +0000
+++ toolkit/mozapps/installer/packager.mk
-@@ -122,8 +122,8 @@ endif
+@@ -131,9 +131,9 @@ endif
+ (cd $(DIST)/$(MOZ_PKG_DIR) && $(TAR) --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \
(cd $(DESTDIR)$(installdir) && tar -xf -)
$(NSINSTALL) -D $(DESTDIR)$(bindir)
- $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
+- $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
- ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
-ifdef INSTALL_SDK # Here comes the hard part
-+ ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)/$(MOZILLA_PKG_NAME)
++ $(RM) -f $(DESTDIR)$(bindir)/$(MOZILLA_PKG_NAME)
++ ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)/${MOZILLA_PKG_NAME}
+ifeq ($(MOZ_APP_NAME),xulrunner)
$(NSINSTALL) -D $(DESTDIR)$(includedir)
(cd $(DIST)/include && $(TAR) $(TAR_CREATE_FLAGS) - .) | \
diff --git a/security/tor-browser/patches/patch-as b/security/tor-browser/patches/patch-as
index 40bf3fc4620..f05fe97c6e1 100644
--- a/security/tor-browser/patches/patch-as
+++ b/security/tor-browser/patches/patch-as
@@ -1,10 +1,10 @@
-$NetBSD: patch-as,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-as,v 1.2 2017/01/22 12:27:21 ryoon Exp $
Treat DragonFly like FreeBSD.
---- js/src/configure.in.orig 2015-01-23 05:59:58.000000000 +0000
-+++ js/src/configure.in 2015-02-16 11:09:33.000000000 +0000
-@@ -2180,8 +2180,7 @@
+--- js/src/configure.in.orig 2016-01-23 23:23:39.000000000 +0000
++++ js/src/configure.in
+@@ -2123,8 +2123,7 @@ AC_LANG_CPLUSPLUS
MOZ_CXX11
@@ -14,7 +14,7 @@ Treat DragonFly like FreeBSD.
dnl ===============================================================
if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then
AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
-@@ -3095,7 +3094,7 @@
+@@ -2960,7 +2959,7 @@ if test "$MOZ_MEMORY"; then
*-darwin*)
AC_DEFINE(MOZ_MEMORY_DARWIN)
;;
@@ -23,7 +23,7 @@ Treat DragonFly like FreeBSD.
AC_DEFINE(MOZ_MEMORY_BSD)
;;
*-android*|*-linuxandroid*)
-@@ -3989,6 +3988,16 @@
+@@ -3808,6 +3807,16 @@ MOZ_SUBCONFIGURE_ICU()
dnl ========================================================
dnl JavaScript shell
dnl ========================================================
@@ -38,5 +38,5 @@ Treat DragonFly like FreeBSD.
+ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
+fi
- MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h"
- MALLOC_H=
+ MOZ_CHECK_ALLOCATOR
+
diff --git a/security/tor-browser/patches/patch-b2g_installer_Makefile.in b/security/tor-browser/patches/patch-b2g_installer_Makefile.in
deleted file mode 100644
index ae0c3581941..00000000000
--- a/security/tor-browser/patches/patch-b2g_installer_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-b2g_installer_Makefile.in,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- b2g/installer/Makefile.in.orig 2015-02-17 21:40:34.000000000 +0000
-+++ b2g/installer/Makefile.in
-@@ -79,6 +79,10 @@ ifneq (,$(filter rtsp,$(NECKO_PROTOCOLS)
- DEFINES += -DMOZ_RTSP
- endif
-
-+ifdef MOZ_DEBUG
-+DEFINES += -DMOZ_DEBUG=1
-+endif
-+
- ifdef GKMEDIAS_SHARED_LIBRARY
- DEFINES += -DGKMEDIAS_SHARED_LIBRARY
- endif
diff --git a/security/tor-browser/patches/patch-b2g_installer_package-manifest.in b/security/tor-browser/patches/patch-b2g_installer_package-manifest.in
deleted file mode 100644
index d28a96e691e..00000000000
--- a/security/tor-browser/patches/patch-b2g_installer_package-manifest.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-b2g_installer_package-manifest.in,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- b2g/installer/package-manifest.in.orig 2015-02-17 21:40:34.000000000 +0000
-+++ b2g/installer/package-manifest.in
-@@ -609,7 +609,7 @@
- @BINPATH@/components/EngineeringModeAPI.js
- @BINPATH@/components/EngineeringModeService.js
-
--#ifdef MOZ_DEBUG
-+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
- @BINPATH@/components/TestInterfaceJS.js
- @BINPATH@/components/TestInterfaceJS.manifest
- #endif
diff --git a/security/tor-browser/patches/patch-bf b/security/tor-browser/patches/patch-bf
index 9196ef62cea..5480c88ed1f 100644
--- a/security/tor-browser/patches/patch-bf
+++ b/security/tor-browser/patches/patch-bf
@@ -1,4 +1,4 @@
-$NetBSD: patch-bf,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-bf,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- js/src/jsnativestack.cpp.orig 2013-09-10 03:43:36.000000000 +0000
+++ js/src/jsnativestack.cpp
diff --git a/security/tor-browser/patches/patch-browser_app_nsBrowserApp.cpp b/security/tor-browser/patches/patch-browser_app_nsBrowserApp.cpp
deleted file mode 100644
index 3d75eb8fac4..00000000000
--- a/security/tor-browser/patches/patch-browser_app_nsBrowserApp.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-browser_app_nsBrowserApp.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
-* Replace XP_MACOSX with XP_DARWIN as the former is not defined when
- the toolkit is not cocoa.
-
---- browser/app/nsBrowserApp.cpp.orig 2015-05-04 00:43:18.000000000 +0000
-+++ browser/app/nsBrowserApp.cpp
-@@ -18,8 +18,10 @@
- #include <unistd.h>
- #endif
-
--#ifdef XP_MACOSX
-+#ifdef XP_DARWIN
- #include <mach/mach_time.h>
-+#endif
-+#ifdef MOZ_WIDGET_COCOA
- #include "MacQuirks.h"
- #endif
-
-@@ -459,7 +461,7 @@ TimeStamp_Now()
- }
-
- return sGetTickCount64() * freq.QuadPart;
--#elif defined(XP_MACOSX)
-+#elif defined(XP_DARWIN)
- return mach_absolute_time();
- #elif defined(HAVE_CLOCK_MONOTONIC)
- struct timespec ts;
-@@ -606,6 +608,7 @@ int main(int argc, char* argv[])
- TriggerQuirks();
- #endif
-
-+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0);
- int gotCounters;
- #if defined(XP_UNIX)
- struct rusage initialRUsage;
diff --git a/security/tor-browser/patches/patch-browser_installer_package-manifest.in b/security/tor-browser/patches/patch-browser_installer_package-manifest.in
index 0b339354873..9d818bbba27 100644
--- a/security/tor-browser/patches/patch-browser_installer_package-manifest.in
+++ b/security/tor-browser/patches/patch-browser_installer_package-manifest.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-browser_installer_package-manifest.in,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-browser_installer_package-manifest.in,v 1.2 2017/01/22 12:27:22 ryoon Exp $
Limit SPARC bits to just SPARC (untested, but fixes x86).
---- browser/installer/package-manifest.in.orig 2015-02-17 21:40:38.000000000 +0000
+--- browser/installer/package-manifest.in.orig 2015-10-22 22:30:28.000000000 +0000
+++ browser/installer/package-manifest.in
-@@ -609,7 +609,7 @@
+@@ -620,7 +620,7 @@
@RESPATH@/components/MozKeyboard.js
@RESPATH@/components/InputMethod.manifest
@@ -12,8 +12,8 @@ Limit SPARC bits to just SPARC (untested, but fixes x86).
+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
@RESPATH@/components/TestInterfaceJS.js
@RESPATH@/components/TestInterfaceJS.manifest
- #endif
-@@ -788,7 +788,7 @@
+ @RESPATH@/components/TestInterfaceJSMaplike.js
+@@ -822,7 +822,7 @@
#endif
; for Solaris SPARC
diff --git a/security/tor-browser/patches/patch-build_autoconf_compiler-opts.m4 b/security/tor-browser/patches/patch-build_autoconf_compiler-opts.m4
index 32fc1ee230b..3e1363951d3 100644
--- a/security/tor-browser/patches/patch-build_autoconf_compiler-opts.m4
+++ b/security/tor-browser/patches/patch-build_autoconf_compiler-opts.m4
@@ -1,4 +1,4 @@
-$NetBSD: patch-build_autoconf_compiler-opts.m4,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-build_autoconf_compiler-opts.m4,v 1.2 2017/01/22 12:27:22 ryoon Exp $
It's true Clang is required if we use the cocoa toolkit, but we don't
do that anyway. GCC is perfectly working as long as we use cairo-gtk2.
diff --git a/security/tor-browser/patches/patch-build_autoconf_nss.m4 b/security/tor-browser/patches/patch-build_autoconf_nss.m4
index 79c149dd65f..92fbc181547 100644
--- a/security/tor-browser/patches/patch-build_autoconf_nss.m4
+++ b/security/tor-browser/patches/patch-build_autoconf_nss.m4
@@ -1,4 +1,4 @@
-$NetBSD: patch-build_autoconf_nss.m4,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-build_autoconf_nss.m4,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- build/autoconf/nss.m4.orig 2015-04-29 21:11:43.000000000 +0000
+++ build/autoconf/nss.m4
diff --git a/security/tor-browser/patches/patch-build_gyp.mozbuild b/security/tor-browser/patches/patch-build_gyp.mozbuild
index 7bee9ecd641..97ecaeaf9be 100644
--- a/security/tor-browser/patches/patch-build_gyp.mozbuild
+++ b/security/tor-browser/patches/patch-build_gyp.mozbuild
@@ -1,4 +1,4 @@
-$NetBSD: patch-build_gyp.mozbuild,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-build_gyp.mozbuild,v 1.2 2017/01/22 12:27:22 ryoon Exp $
Hunk #2:
On Darwin, don't assume iOS just because the toolkit is not
diff --git a/security/tor-browser/patches/patch-build_pgo_profileserver.py b/security/tor-browser/patches/patch-build_pgo_profileserver.py
index 48f00c2f1af..f006df9f679 100644
--- a/security/tor-browser/patches/patch-build_pgo_profileserver.py
+++ b/security/tor-browser/patches/patch-build_pgo_profileserver.py
@@ -1,4 +1,4 @@
-$NetBSD: patch-build_pgo_profileserver.py,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-build_pgo_profileserver.py,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- build/pgo/profileserver.py.orig 2014-03-15 05:19:09.000000000 +0000
+++ build/pgo/profileserver.py
diff --git a/security/tor-browser/patches/patch-config_Makefile.in b/security/tor-browser/patches/patch-config_Makefile.in
index bbfe02375e1..0455e1d4ebd 100644
--- a/security/tor-browser/patches/patch-config_Makefile.in
+++ b/security/tor-browser/patches/patch-config_Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-config_Makefile.in,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-config_Makefile.in,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- config/Makefile.in.orig 2015-05-04 00:43:23.000000000 +0000
+++ config/Makefile.in
diff --git a/security/tor-browser/patches/patch-config_baseconfig.mk b/security/tor-browser/patches/patch-config_baseconfig.mk
index 3ec4af38f16..965ce3157dd 100644
--- a/security/tor-browser/patches/patch-config_baseconfig.mk
+++ b/security/tor-browser/patches/patch-config_baseconfig.mk
@@ -1,6 +1,6 @@
-$NetBSD: patch-config_baseconfig.mk,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-config_baseconfig.mk,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- config/baseconfig.mk.orig 2014-04-18 02:02:39.000000000 +0000
+--- config/baseconfig.mk.orig 2016-02-25 23:01:53.000000000 +0000
+++ config/baseconfig.mk
@@ -2,10 +2,10 @@
# directly in python/mozbuild/mozbuild/base.py for gmake validation.
@@ -14,6 +14,6 @@ $NetBSD: patch-config_baseconfig.mk,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+idldir = $(datadir)/idl/${MOZILLA_PKG_NAME}
+installdir = $(libdir)/${MOZILLA_PKG_NAME}
+sdkdir = $(libdir)/${MOZILLA_PKG_NAME}
- ifndef TOP_DIST
- TOP_DIST = dist
- endif
+ ifeq (.,$(DEPTH))
+ DIST = dist
+ else
diff --git a/security/tor-browser/patches/patch-config_external_moz.build b/security/tor-browser/patches/patch-config_external_moz.build
index d8d0ac82d0f..20c1b4596d3 100644
--- a/security/tor-browser/patches/patch-config_external_moz.build
+++ b/security/tor-browser/patches/patch-config_external_moz.build
@@ -1,6 +1,6 @@
-$NetBSD: patch-config_external_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-config_external_moz.build,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- config/external/moz.build.orig 2015-05-04 00:43:23.000000000 +0000
+--- config/external/moz.build.orig 2015-08-24 21:53:10.000000000 +0000
+++ config/external/moz.build
@@ -19,10 +19,19 @@ if CONFIG['MOZ_UPDATER']:
# There's no "native brotli" yet, but probably in the future...
@@ -24,25 +24,13 @@ $NetBSD: patch-config_external_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
external_dirs += ['media/libtremor']
if CONFIG['MOZ_WEBM']:
-@@ -37,15 +46,16 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ
- if not CONFIG['MOZ_NATIVE_PNG']:
- external_dirs += ['media/libpng']
-
-+if not CONFIG['MOZ_NATIVE_SPEEX']:
-+ external_dirs += ['media/libspeex_resampler']
-+
-+if not CONFIG['MOZ_NATIVE_SOUNDTOUCH']:
-+ external_dirs += ['media/libsoundtouch']
-+
+@@ -49,9 +58,6 @@ if CONFIG['MOZ_WEBSPEECH_POCKETSPHINX']:
external_dirs += [
'media/kiss_fft',
'media/libcubeb',
- 'media/libogg',
- 'media/libopus',
- 'media/libtheora',
-- 'media/libspeex_resampler',
+ 'media/libspeex_resampler',
'media/libstagefright',
-- 'media/libsoundtouch',
- ]
-
- DIRS += ['../../' + i for i in external_dirs]
+ 'media/libsoundtouch',
diff --git a/security/tor-browser/patches/patch-config_rules.mk b/security/tor-browser/patches/patch-config_rules.mk
index aa7836bae06..3f5528bae7d 100644
--- a/security/tor-browser/patches/patch-config_rules.mk
+++ b/security/tor-browser/patches/patch-config_rules.mk
@@ -1,4 +1,4 @@
-$NetBSD: patch-config_rules.mk,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-config_rules.mk,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- config/rules.mk.orig 2015-02-17 21:40:40.000000000 +0000
+++ config/rules.mk
diff --git a/security/tor-browser/patches/patch-config_stl__wrappers_ios b/security/tor-browser/patches/patch-config_stl__wrappers_ios
index 3e663f11ae7..c06e19e6450 100644
--- a/security/tor-browser/patches/patch-config_stl__wrappers_ios
+++ b/security/tor-browser/patches/patch-config_stl__wrappers_ios
@@ -1,4 +1,4 @@
-$NetBSD: patch-config_stl__wrappers_ios,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-config_stl__wrappers_ios,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- config/stl_wrappers/ios.orig 2013-05-13 18:23:07.000000000 +0000
+++ config/stl_wrappers/ios
diff --git a/security/tor-browser/patches/patch-config_stl__wrappers_ostream b/security/tor-browser/patches/patch-config_stl__wrappers_ostream
index 22dbde9637b..82aa0afb9cb 100644
--- a/security/tor-browser/patches/patch-config_stl__wrappers_ostream
+++ b/security/tor-browser/patches/patch-config_stl__wrappers_ostream
@@ -1,4 +1,4 @@
-$NetBSD: patch-config_stl__wrappers_ostream,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-config_stl__wrappers_ostream,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- config/stl_wrappers/ostream.orig 2013-05-13 18:22:40.000000000 +0000
+++ config/stl_wrappers/ostream
diff --git a/security/tor-browser/patches/patch-config_system-headers b/security/tor-browser/patches/patch-config_system-headers
index 5f41858e798..ada7e5e884f 100644
--- a/security/tor-browser/patches/patch-config_system-headers
+++ b/security/tor-browser/patches/patch-config_system-headers
@@ -1,24 +1,16 @@
-$NetBSD: patch-config_system-headers,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-config_system-headers,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- config/system-headers.orig 2015-12-14 23:36:05.000000000 +0000
+--- config/system-headers.orig 2016-01-15 01:01:40.000000000 +0000
+++ config/system-headers
-@@ -189,7 +189,6 @@ asm/signal.h
- ASRegistry.h
- assert.h
- atk/atk.h
--atk-bridge.h
- atlcom.h
- atlconv.h
- atlctl.cpp
-@@ -638,6 +637,7 @@ libgnomevfs/gnome-vfs-mime-handlers.h
- libgnomevfs/gnome-vfs-mime-utils.h
- libgnomevfs/gnome-vfs-ops.h
- libgnomevfs/gnome-vfs-standard-callbacks.h
+@@ -627,6 +627,7 @@ libgnome/libgnome.h
+ libgnomeui/gnome-icon-lookup.h
+ libgnomeui/gnome-icon-theme.h
+ libgnomeui/gnome-ui-init.h
+libv4l2.h
lib$routines.h
limits
limits.h
-@@ -732,6 +732,7 @@ mapiutil.h
+@@ -721,6 +722,7 @@ mapiutil.h
mapix.h
Math64.h
math.h
@@ -26,37 +18,39 @@ $NetBSD: patch-config_system-headers,v 1.1 2016/02/14 07:30:54 ryoon Exp $
mbstring.h
#ifdef ANDROID
media/AudioEffect.h
-@@ -1268,7 +1269,6 @@ X11/Xlocale.h
- X11/Xos.h
- X11/Xutil.h
- zmouse.h
--soundtouch/SoundTouch.h
- #if MOZ_NATIVE_PNG==1
- png.h
+@@ -1313,6 +1315,25 @@ vpx/vp8cx.h
+ vpx/vp8dx.h
+ vpx_mem/vpx_mem.h
#endif
-@@ -1330,10 +1330,13 @@ vorbis/codec.h
- theora/theoradec.h
- tremor/ivorbiscodec.h
- speex/speex_resampler.h
++#ifdef GKMEDIAS_SHARED_LIBRARY
++vpx/vpx_codec.h
++vpx/vpx_decoder.h
++vpx/vpx_encoder.h
++vpx/vp8cx.h
++vpx/vp8dx.h
++vpx_mem/vpx_mem.h
++vorbis/codec.h
++theora/theoradec.h
++tremor/ivorbiscodec.h
++speex/speex_resampler.h
+soundtouch/SoundTouch.h
- ogg/ogg.h
- ogg/os_types.h
- nestegg/nestegg.h
- cubeb/cubeb.h
++ogg/ogg.h
++ogg/os_types.h
++nestegg/nestegg.h
++cubeb/cubeb.h
+speex/speex_resampler.h
+soundtouch/SoundTouch.h
- #endif
++#endif
gst/gst.h
gst/app/gstappsink.h
-@@ -1362,3 +1365,45 @@ unicode/utypes.h
+ gst/app/gstappsrc.h
+@@ -1343,3 +1364,43 @@ unicode/utypes.h
#endif
libutil.h
unwind.h
+#if MOZ_NATIVE_GRAPHITE2==1
+graphite2/Font.h
-+graphite2/Log.h
+graphite2/Segment.h
-+graphite2/Types.h
+#endif
+#if MOZ_NATIVE_HARFBUZZ==1
+harfbuzz/hb-ot.h
diff --git a/security/tor-browser/patches/patch-config_system__wrappers_unwind.h b/security/tor-browser/patches/patch-config_system__wrappers_unwind.h
new file mode 100644
index 00000000000..a06ad253002
--- /dev/null
+++ b/security/tor-browser/patches/patch-config_system__wrappers_unwind.h
@@ -0,0 +1,9 @@
+$NetBSD: patch-config_system__wrappers_unwind.h,v 1.1 2017/01/22 12:27:22 ryoon Exp $
+
+--- config/system_wrappers/unwind.h.orig 2013-05-13 19:56:18.000000000 +0000
++++ config/system_wrappers/unwind.h
+@@ -0,0 +1,4 @@
++#pragma GCC system_header
++#pragma GCC visibility push(default)
++#include_next <unwind.h>
++#pragma GCC visibility pop
diff --git a/security/tor-browser/patches/patch-dom_base_DOMRequest.cpp b/security/tor-browser/patches/patch-dom_base_DOMRequest.cpp
new file mode 100644
index 00000000000..fcaac8eacca
--- /dev/null
+++ b/security/tor-browser/patches/patch-dom_base_DOMRequest.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-dom_base_DOMRequest.cpp,v 1.1 2017/01/22 12:27:22 ryoon Exp $
+
+--- dom/base/DOMRequest.cpp.orig 2015-09-17 22:13:30.000000000 +0000
++++ dom/base/DOMRequest.cpp
+@@ -19,7 +19,6 @@ using mozilla::dom::DOMError;
+ using mozilla::dom::DOMRequest;
+ using mozilla::dom::DOMRequestService;
+ using mozilla::dom::DOMCursor;
+-using mozilla::dom::Promise;
+ using mozilla::dom::AutoJSAPI;
+
+ DOMRequest::DOMRequest(nsPIDOMWindow* aWindow)
diff --git a/security/tor-browser/patches/patch-dom_base_moz.build b/security/tor-browser/patches/patch-dom_base_moz.build
index 88169f7e0b2..d79608632e2 100644
--- a/security/tor-browser/patches/patch-dom_base_moz.build
+++ b/security/tor-browser/patches/patch-dom_base_moz.build
@@ -1,4 +1,4 @@
-$NetBSD: patch-dom_base_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-dom_base_moz.build,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- dom/base/moz.build.orig 2015-02-17 21:40:41.000000000 +0000
+++ dom/base/moz.build
diff --git a/security/tor-browser/patches/patch-dom_events_MessageEvent.h b/security/tor-browser/patches/patch-dom_events_MessageEvent.h
deleted file mode 100644
index b8dadc65f0f..00000000000
--- a/security/tor-browser/patches/patch-dom_events_MessageEvent.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-dom_events_MessageEvent.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- dom/events/MessageEvent.h.orig 2015-11-19 13:56:48.000000000 +0000
-+++ dom/events/MessageEvent.h
-@@ -15,9 +15,6 @@ namespace mozilla {
- namespace dom {
-
- struct MessageEventInit;
--class MessagePort;
--class MessagePortBase;
--class MessagePortList;
- class OwningWindowProxyOrMessagePort;
-
- /**
diff --git a/security/tor-browser/patches/patch-dom_media_AudioStream.h b/security/tor-browser/patches/patch-dom_media_AudioStream.h
deleted file mode 100644
index af1f3b200c6..00000000000
--- a/security/tor-browser/patches/patch-dom_media_AudioStream.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dom_media_AudioStream.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- dom/media/AudioStream.h.orig 2015-02-17 21:40:44.000000000 +0000
-+++ dom/media/AudioStream.h
-@@ -17,7 +17,7 @@
- #include "CubebUtils.h"
-
- namespace soundtouch {
--class SoundTouch;
-+class MOZ_IMPORT_API SoundTouch;
- }
-
- namespace mozilla {
diff --git a/security/tor-browser/patches/patch-dom_media_gstreamer_GStreamerAllocator.cpp b/security/tor-browser/patches/patch-dom_media_gstreamer_GStreamerAllocator.cpp
index 3c23f8692b2..1f5b30bd9c9 100644
--- a/security/tor-browser/patches/patch-dom_media_gstreamer_GStreamerAllocator.cpp
+++ b/security/tor-browser/patches/patch-dom_media_gstreamer_GStreamerAllocator.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-dom_media_gstreamer_GStreamerAllocator.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-dom_media_gstreamer_GStreamerAllocator.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- dom/media/gstreamer/GStreamerAllocator.cpp.orig 2015-02-17 21:40:44.000000000 +0000
+++ dom/media/gstreamer/GStreamerAllocator.cpp
diff --git a/security/tor-browser/patches/patch-dom_media_moz.build b/security/tor-browser/patches/patch-dom_media_moz.build
index a5c63569083..d24580d5dee 100644
--- a/security/tor-browser/patches/patch-dom_media_moz.build
+++ b/security/tor-browser/patches/patch-dom_media_moz.build
@@ -1,4 +1,4 @@
-$NetBSD: patch-dom_media_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-dom_media_moz.build,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- dom/media/moz.build.orig 2015-03-27 02:20:26.000000000 +0000
+++ dom/media/moz.build
diff --git a/security/tor-browser/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp b/security/tor-browser/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp
index af77625db67..87e1a6b067a 100644
--- a/security/tor-browser/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp
+++ b/security/tor-browser/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- dom/plugins/ipc/PluginModuleChild.cpp.orig 2015-03-27 02:20:27.000000000 +0000
+++ dom/plugins/ipc/PluginModuleChild.cpp
diff --git a/security/tor-browser/patches/patch-dom_plugins_ipc_PluginModuleChild.h b/security/tor-browser/patches/patch-dom_plugins_ipc_PluginModuleChild.h
index 70f82d2d445..8c8d451ff18 100644
--- a/security/tor-browser/patches/patch-dom_plugins_ipc_PluginModuleChild.h
+++ b/security/tor-browser/patches/patch-dom_plugins_ipc_PluginModuleChild.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.h,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- dom/plugins/ipc/PluginModuleChild.h.orig 2013-05-11 19:19:27.000000000 +0000
+++ dom/plugins/ipc/PluginModuleChild.h
diff --git a/security/tor-browser/patches/patch-dom_plugins_ipc_PluginProcessChild.cpp b/security/tor-browser/patches/patch-dom_plugins_ipc_PluginProcessChild.cpp
index 33399638877..31e3ca73395 100644
--- a/security/tor-browser/patches/patch-dom_plugins_ipc_PluginProcessChild.cpp
+++ b/security/tor-browser/patches/patch-dom_plugins_ipc_PluginProcessChild.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-dom_plugins_ipc_PluginProcessChild.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-dom_plugins_ipc_PluginProcessChild.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
Just because OS_ARCH is Darwin does not mean
libplugin_child_interpose.dylib is used.
diff --git a/security/tor-browser/patches/patch-dom_system_OSFileConstants.cpp b/security/tor-browser/patches/patch-dom_system_OSFileConstants.cpp
index eed133696ea..b911f9d42ed 100644
--- a/security/tor-browser/patches/patch-dom_system_OSFileConstants.cpp
+++ b/security/tor-browser/patches/patch-dom_system_OSFileConstants.cpp
@@ -1,13 +1,13 @@
-$NetBSD: patch-dom_system_OSFileConstants.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-dom_system_OSFileConstants.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
* NetBSD 5 does not support posix_spawn(3)
* Replace XP_MACOSX with XP_DARWIN as the former is not defined when
the toolkit is not cocoa.
---- dom/system/OSFileConstants.cpp.orig 2014-07-17 01:45:12.000000000 +0000
-+++ dom/system/OSFileConstants.cpp 2014-08-19 17:41:25.000000000 +0000
-@@ -9,6 +9,10 @@
+--- dom/system/OSFileConstants.cpp.orig 2015-10-22 22:30:38.000000000 +0000
++++ dom/system/OSFileConstants.cpp
+@@ -11,6 +11,10 @@
#include "prsystem.h"
@@ -18,7 +18,7 @@ $NetBSD: patch-dom_system_OSFileConstants.cpp,v 1.1 2016/02/14 07:30:54 ryoon Ex
#if defined(XP_UNIX)
#include "unistd.h"
#include "dirent.h"
-@@ -18,7 +22,9 @@
+@@ -20,7 +24,9 @@
#define statvfs statfs
#else
#include "sys/statvfs.h"
@@ -28,7 +28,7 @@ $NetBSD: patch-dom_system_OSFileConstants.cpp,v 1.1 2016/02/14 07:30:54 ryoon Ex
#endif // defined(ANDROID)
#endif // defined(XP_UNIX)
-@@ -26,9 +32,9 @@
+@@ -28,9 +34,9 @@
#include <linux/fadvise.h>
#endif // defined(XP_LINUX)
@@ -40,25 +40,12 @@ $NetBSD: patch-dom_system_OSFileConstants.cpp,v 1.1 2016/02/14 07:30:54 ryoon Ex
#if defined(XP_WIN)
#include <windows.h>
-@@ -564,10 +570,10 @@
+@@ -590,7 +596,7 @@ static const dom::ConstantSpec gLibcProp
// The size of |fsblkcnt_t|.
- { "OSFILE_SIZEOF_FSBLKCNT_T", INT_TO_JSVAL(sizeof (fsblkcnt_t)) },
+ { "OSFILE_SIZEOF_FSBLKCNT_T", JS::Int32Value(sizeof (fsblkcnt_t)) },
-#if !defined(ANDROID)
+#if !defined(ANDROID) && !(defined(__NetBSD__) && (__NetBSD_Version__ < 600000000))
// The size of |posix_spawn_file_actions_t|.
- { "OSFILE_SIZEOF_POSIX_SPAWN_FILE_ACTIONS_T", INT_TO_JSVAL(sizeof (posix_spawn_file_actions_t)) },
--#endif // !defined(ANDROID)
-+#endif // !defined(ANDROID) && NetBSD 5.*
-
- // Defining |dirent|.
- // Size
-@@ -627,7 +633,7 @@
-
- { "OSFILE_SIZEOF_STATVFS", INT_TO_JSVAL(sizeof (struct statvfs)) },
-
-- { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_bsize)) },
-+ { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_frsize)) },
- { "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", INT_TO_JSVAL(offsetof (struct statvfs, f_bavail)) },
-
- #endif // defined(XP_UNIX)
+ { "OSFILE_SIZEOF_POSIX_SPAWN_FILE_ACTIONS_T", JS::Int32Value(sizeof (posix_spawn_file_actions_t)) },
+ #endif // !defined(ANDROID)
diff --git a/security/tor-browser/patches/patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp b/security/tor-browser/patches/patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp
index 680bd54e0f9..6b317bd3261 100644
--- a/security/tor-browser/patches/patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp
+++ b/security/tor-browser/patches/patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp
@@ -1,10 +1,8 @@
-$NetBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp,v 1.1 2017/01/22 12:27:22 ryoon Exp $
-Load system hunspell dictionaries.
-
---- extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig 2015-05-04 00:43:34.000000000 +0000
-+++ extensions/spellcheck/hunspell/src/mozHunspell.cpp
-@@ -400,6 +400,14 @@ mozHunspell::LoadDictionaryList(bool aNo
+--- extensions/spellcheck/hunspell/glue/mozHunspell.cpp.orig 2015-12-04 00:37:13.000000000 +0000
++++ extensions/spellcheck/hunspell/glue/mozHunspell.cpp
+@@ -392,6 +392,14 @@ mozHunspell::LoadDictionaryList(bool aNo
}
}
diff --git a/security/tor-browser/patches/patch-gfx_cairo_libpixman_src_pixman-arm-neon-asm.S b/security/tor-browser/patches/patch-gfx_cairo_libpixman_src_pixman-arm-neon-asm.S
new file mode 100644
index 00000000000..7673b7b6302
--- /dev/null
+++ b/security/tor-browser/patches/patch-gfx_cairo_libpixman_src_pixman-arm-neon-asm.S
@@ -0,0 +1,37 @@
+$NetBSD: patch-gfx_cairo_libpixman_src_pixman-arm-neon-asm.S,v 1.1 2017/01/22 12:27:22 ryoon Exp $
+
+--- gfx/cairo/libpixman/src/pixman-arm-neon-asm.S.orig 2015-09-29 21:45:08.000000000 +0000
++++ gfx/cairo/libpixman/src/pixman-arm-neon-asm.S
+@@ -34,6 +34,12 @@
+ * - pixman_composite_over_n_8_0565_asm_neon
+ */
+
++#if defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__)
++#define UNWIND
++#else
++#define UNWIND @
++#endif
++
+ /* Prevent the stack from becoming executable for no reason... */
+ #if defined(__linux__) && defined(__ELF__)
+ .section .note.GNU-stack,"",%progbits
+@@ -3141,7 +3147,8 @@ pixman_asm_function fname
+ TMP4 .req r9
+ STRIDE .req r2
+
+- .fnstart
++ .cfi_startproc
++ UNWIND .fnstart
+ mov ip, sp
+ .save {r4, r5, r6, r7, r8, r9}
+ push {r4, r5, r6, r7, r8, r9}
+@@ -3244,7 +3251,8 @@ pixman_asm_function fname
+ .endif
+ pop {r4, r5, r6, r7, r8, r9}
+ bx lr
+- .fnend
++ UNWIND .fnend
++ .cfi_endproc
+
+ .unreq OUT
+ .unreq TOP
diff --git a/security/tor-browser/patches/patch-gfx_gl_GLContextProviderGLX.cpp b/security/tor-browser/patches/patch-gfx_gl_GLContextProviderGLX.cpp
new file mode 100644
index 00000000000..f62a8d3cd5d
--- /dev/null
+++ b/security/tor-browser/patches/patch-gfx_gl_GLContextProviderGLX.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-gfx_gl_GLContextProviderGLX.cpp,v 1.1 2017/01/22 12:27:22 ryoon Exp $
+
+Fix libGL.so filename on NetBSD,
+see https://bugzilla.mozilla.org/show_bug.cgi?id=1180498
+
+--- gfx/gl/GLContextProviderGLX.cpp.orig 2015-07-01 00:58:10.000000000 +0200
++++ gfx/gl/GLContextProviderGLX.cpp 2015-07-04 21:13:15.000000000 +0200
+@@ -82,7 +82,7 @@
+ // see e.g. bug 608526: it is intrinsically interesting to know whether we have dynamically linked to libGL.so.1
+ // because at least the NVIDIA implementation requires an executable stack, which causes mprotect calls,
+ // which trigger glibc bug http://sourceware.org/bugzilla/show_bug.cgi?id=12225
+-#ifdef __OpenBSD__
++#if defined(__OpenBSD__) || defined(__NetBSD__)
+ libGLfilename = "libGL.so";
+ #else
+ libGLfilename = "libGL.so.1";
diff --git a/security/tor-browser/patches/patch-gfx_graphite2_src_Bidi.cpp b/security/tor-browser/patches/patch-gfx_graphite2_src_Bidi.cpp
index ad1f3c70b0d..a8dce7036bb 100644
--- a/security/tor-browser/patches/patch-gfx_graphite2_src_Bidi.cpp
+++ b/security/tor-browser/patches/patch-gfx_graphite2_src_Bidi.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-gfx_graphite2_src_Bidi.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-gfx_graphite2_src_Bidi.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- gfx/graphite2/src/Bidi.cpp.orig 2013-05-11 19:19:30.000000000 +0000
+++ gfx/graphite2/src/Bidi.cpp
diff --git a/security/tor-browser/patches/patch-gfx_graphite2_src_moz.build b/security/tor-browser/patches/patch-gfx_graphite2_src_moz.build
deleted file mode 100644
index b7357c3ed79..00000000000
--- a/security/tor-browser/patches/patch-gfx_graphite2_src_moz.build
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gfx_graphite2_src_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- gfx/graphite2/src/moz.build.orig 2016-01-31 20:42:26.674057599 +0000
-+++ gfx/graphite2/src/moz.build
-@@ -60,10 +60,6 @@ MSVC_ENABLE_PGO = True
- if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
- NO_VISIBILITY_FLAGS = True
- DEFINES['GRAPHITE2_EXPORTING'] = True
--else:
-- # tell graphite2 not to export symbols, we'll be linking it directly with
-- # thebes
-- DEFINES['GRAPHITE2_STATIC'] = True
-
- FINAL_LIBRARY = 'gkmedias'
-
diff --git a/security/tor-browser/patches/patch-gfx_moz.build b/security/tor-browser/patches/patch-gfx_moz.build
index e230fcf4edd..f5f4aca3d2a 100644
--- a/security/tor-browser/patches/patch-gfx_moz.build
+++ b/security/tor-browser/patches/patch-gfx_moz.build
@@ -1,4 +1,4 @@
-$NetBSD: patch-gfx_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-gfx_moz.build,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- gfx/moz.build.orig 2014-03-15 05:19:16.000000000 +0000
+++ gfx/moz.build
diff --git a/security/tor-browser/patches/patch-gfx_skia_generate__mozbuild.py b/security/tor-browser/patches/patch-gfx_skia_generate__mozbuild.py
index e436fb8e514..16c9c2b938e 100644
--- a/security/tor-browser/patches/patch-gfx_skia_generate__mozbuild.py
+++ b/security/tor-browser/patches/patch-gfx_skia_generate__mozbuild.py
@@ -1,14 +1,17 @@
-$NetBSD: patch-gfx_skia_generate__mozbuild.py,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-gfx_skia_generate__mozbuild.py,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- gfx/skia/generate_mozbuild.py.orig 2014-11-21 03:37:30.000000000 +0000
+--- gfx/skia/generate_mozbuild.py.orig 2015-10-22 22:30:23.000000000 +0000
+++ gfx/skia/generate_mozbuild.py
-@@ -140,6 +140,9 @@ if CONFIG['GNU_CXX']:
- if not CONFIG['CLANG_CXX']:
- CXXFLAGS += ['-Wno-logical-op']
+@@ -147,6 +147,12 @@ if CONFIG['GNU_CXX']:
+ if CONFIG['CPU_ARCH'] == 'arm':
+ SOURCES['skia/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
++if CONFIG['MOZ_NATIVE_HARFBUZZ']:
++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
++
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
diff --git a/security/tor-browser/patches/patch-gfx_skia_moz.build b/security/tor-browser/patches/patch-gfx_skia_moz.build
index acf329d5c45..a5d2cb5dbbb 100644
--- a/security/tor-browser/patches/patch-gfx_skia_moz.build
+++ b/security/tor-browser/patches/patch-gfx_skia_moz.build
@@ -1,14 +1,17 @@
-$NetBSD: patch-gfx_skia_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-gfx_skia_moz.build,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- gfx/skia/moz.build.orig 2014-11-21 03:37:30.000000000 +0000
+--- gfx/skia/moz.build.orig 2015-10-22 22:30:23.000000000 +0000
+++ gfx/skia/moz.build
-@@ -968,6 +968,9 @@ if CONFIG['GNU_CXX']:
- if not CONFIG['CLANG_CXX']:
- CXXFLAGS += ['-Wno-logical-op']
+@@ -675,6 +675,12 @@ if CONFIG['GNU_CXX']:
+ if CONFIG['CPU_ARCH'] == 'arm':
+ SOURCES['skia/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
++if CONFIG['MOZ_NATIVE_HARFBUZZ']:
++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
++
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
diff --git a/security/tor-browser/patches/patch-gfx_skia_skia_src_core_SkUtilsArm.cpp b/security/tor-browser/patches/patch-gfx_skia_skia_src_core_SkUtilsArm.cpp
new file mode 100644
index 00000000000..03623e41c6d
--- /dev/null
+++ b/security/tor-browser/patches/patch-gfx_skia_skia_src_core_SkUtilsArm.cpp
@@ -0,0 +1,45 @@
+$NetBSD: patch-gfx_skia_skia_src_core_SkUtilsArm.cpp,v 1.1 2017/01/22 12:27:22 ryoon Exp $
+
+--- gfx/skia/skia/src/core/SkUtilsArm.cpp.orig 2015-10-22 22:30:24.000000000 +0000
++++ gfx/skia/skia/src/core/SkUtilsArm.cpp
+@@ -16,6 +16,10 @@
+ #include <string.h>
+ #include <pthread.h>
+
++#if defined(__NetBSD__)
++#include <sys/sysctl.h>
++#endif
++
+ // Set USE_ANDROID_NDK_CPU_FEATURES to use the Android NDK's
+ // cpu-features helper library to detect NEON at runtime. See
+ // http://crbug.com/164154 to see why this is needed in Chromium
+@@ -47,6 +51,11 @@
+ # endif
+ #endif
+
++#if !defined(TEMP_FAILURE_RETRY)
++ // TEMP_FAILURE_RETRY is glibc specific
++# define TEMP_FAILURE_RETRY
++#endif
++
+ // A function used to determine at runtime if the target CPU supports
+ // the ARM NEON instruction set. This implementation is Linux-specific.
+ static bool sk_cpu_arm_check_neon(void) {
+@@ -82,6 +91,17 @@ static bool sk_cpu_arm_check_neon(void)
+
+ result = (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
+
++#elif defined(__NetBSD__)
++
++ size_t len;
++ int flag;
++ len = sizeof(flag);
++ if (sysctlbyname("machdep.neon_present", &flag, &len, NULL, 0) == 0) {
++ result = flag != 0;
++ } else {
++ result = false;
++ }
++
+ #else // USE_ANDROID_NDK_CPU_FEATURES
+
+ // There is no user-accessible CPUID instruction on ARM that we can use.
diff --git a/security/tor-browser/patches/patch-gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp b/security/tor-browser/patches/patch-gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp
new file mode 100644
index 00000000000..8e55c4ba025
--- /dev/null
+++ b/security/tor-browser/patches/patch-gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp
@@ -0,0 +1,28 @@
+$NetBSD: patch-gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp,v 1.1 2017/01/22 12:27:22 ryoon Exp $
+
+--- gfx/skia/skia/src/opts/SkBitmapProcState_opts_arm.cpp.orig 2015-10-22 22:30:24.000000000 +0000
++++ gfx/skia/skia/src/opts/SkBitmapProcState_opts_arm.cpp
+@@ -97,7 +97,11 @@ void SI8_D16_nofilter_DX_arm(const SkBit
+ "2: \n\t"
+ : [xx] "+r" (xx), [count8] "+r" (count8), [colors] "+r" (colors)
+ : [table] "r" (table), [srcAddr] "r" (srcAddr)
++#if defined(__NetBSD__)
++ : "memory", "cc", "r4", "r5", "r6", "r7", "r8", "r9", "r10"
++#else
+ : "memory", "cc", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11"
++#endif
+ );
+
+ for (i = (count & 7); i > 0; --i) {
+@@ -181,7 +185,11 @@ void SI8_opaque_D32_nofilter_DX_arm(cons
+ "4: \n\t" // exit
+ : [xx] "+r" (xx), [count] "+r" (count), [colors] "+r" (colors)
+ : [table] "r" (table), [srcAddr] "r" (srcAddr)
++#if defined(__NetBSD__)
++ : "memory", "cc", "r4", "r5", "r6", "r7", "r8", "r9", "r10"
++#else
+ : "memory", "cc", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11"
++#endif
+ );
+ }
+
diff --git a/security/tor-browser/patches/patch-gfx_skia_skia_src_opts_memset.arm.S b/security/tor-browser/patches/patch-gfx_skia_skia_src_opts_memset.arm.S
new file mode 100644
index 00000000000..3a66d287dcc
--- /dev/null
+++ b/security/tor-browser/patches/patch-gfx_skia_skia_src_opts_memset.arm.S
@@ -0,0 +1,49 @@
+$NetBSD: patch-gfx_skia_skia_src_opts_memset.arm.S,v 1.1 2017/01/22 12:27:22 ryoon Exp $
+
+--- gfx/skia/skia/src/opts/memset.arm.S.orig 2015-10-22 22:30:24.000000000 +0000
++++ gfx/skia/skia/src/opts/memset.arm.S
+@@ -13,6 +13,12 @@
+ * to aid future maintenance.
+ */
+
++#if defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__)
++#define UNWIND
++#else
++#define UNWIND @
++#endif
++
+ .text
+ .align 4
+ .syntax unified
+@@ -30,7 +36,8 @@
+ *
+ */
+ arm_memset16:
+- .fnstart
++ .cfi_startproc
++ UNWIND .fnstart
+ push {lr}
+
+ /* if count is equal to zero then abort */
+@@ -51,10 +58,12 @@ arm_memset16:
+
+ /* Now jump into the main loop below. */
+ b .Lwork_32
+- .fnend
++ UNWIND .fnend
++ .cfi_endproc
+
+ arm_memset32:
+- .fnstart
++ .cfi_startproc
++ UNWIND .fnstart
+ push {lr}
+
+ /* if count is equal to zero then abort */
+@@ -108,4 +117,5 @@ arm_memset32:
+
+ .Lfinish:
+ pop {pc}
+- .fnend
++ UNWIND .fnend
++ .cfi_endproc
diff --git a/security/tor-browser/patches/patch-gfx_thebes_moz.build b/security/tor-browser/patches/patch-gfx_thebes_moz.build
index fa02523719a..ddcb25c37a7 100644
--- a/security/tor-browser/patches/patch-gfx_thebes_moz.build
+++ b/security/tor-browser/patches/patch-gfx_thebes_moz.build
@@ -1,8 +1,8 @@
-$NetBSD: patch-gfx_thebes_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-gfx_thebes_moz.build,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- gfx/thebes/moz.build.orig 2015-12-14 23:35:58.000000000 +0000
+--- gfx/thebes/moz.build.orig 2016-01-23 23:23:35.000000000 +0000
+++ gfx/thebes/moz.build
-@@ -287,6 +287,12 @@ CXXFLAGS += CONFIG['TK_CFLAGS']
+@@ -291,6 +291,12 @@ CXXFLAGS += CONFIG['TK_CFLAGS']
CFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CFLAGS += CONFIG['TK_CFLAGS']
@@ -15,11 +15,11 @@ $NetBSD: patch-gfx_thebes_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk', 'qt'):
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
-@@ -298,7 +304,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
- CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
+@@ -304,7 +310,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk
+
+ LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
-DEFINES['GRAPHITE2_STATIC'] = True
-
- if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
- DEFINES['OTS_DLL'] = True
+ if CONFIG['OS_ARCH'] == 'WINNT':
+ del DEFINES['UNICODE']
diff --git a/security/tor-browser/patches/patch-gfx_ycbcr_moz.build b/security/tor-browser/patches/patch-gfx_ycbcr_moz.build
index 8cb6abe333c..059ecaaa2ed 100644
--- a/security/tor-browser/patches/patch-gfx_ycbcr_moz.build
+++ b/security/tor-browser/patches/patch-gfx_ycbcr_moz.build
@@ -1,4 +1,4 @@
-$NetBSD: patch-gfx_ycbcr_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-gfx_ycbcr_moz.build,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- gfx/ycbcr/moz.build.orig 2014-11-26 12:30:03.000000000 +0000
+++ gfx/ycbcr/moz.build
diff --git a/security/tor-browser/patches/patch-gfx_ycbcr_yuv__row__arm.S b/security/tor-browser/patches/patch-gfx_ycbcr_yuv__row__arm.S
index 1249c4543f9..f6af4e18be4 100644
--- a/security/tor-browser/patches/patch-gfx_ycbcr_yuv__row__arm.S
+++ b/security/tor-browser/patches/patch-gfx_ycbcr_yuv__row__arm.S
@@ -1,317 +1,40 @@
-$NetBSD: patch-gfx_ycbcr_yuv__row__arm.S,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-gfx_ycbcr_yuv__row__arm.S,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- gfx/ycbcr/yuv_row_arm.S.orig 2014-12-01 14:53:14.000000000 +0000
+--- gfx/ycbcr/yuv_row_arm.S.orig 2016-04-20 21:32:52.000000000 +0000
+++ gfx/ycbcr/yuv_row_arm.S
-@@ -0,0 +1,312 @@
-+/* This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
+@@ -2,6 +2,12 @@
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#if defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__)
+#define UNWIND
+#else
+#define UNWIND @
+#endif
+
-+ .arch armv7-a
-+ .fpu neon
-+/* Allow to build on targets not supporting neon, and force the object file
-+ * target to avoid bumping the final binary target */
-+ .object_arch armv4t
-+ .text
-+ .align
-+
-+ .balign 64
-+YCbCr42xToRGB565_DITHER03_CONSTS_NEON:
-+ .short -14240
-+ .short -14240+384
-+ .short 8672
-+ .short 8672+192
-+ .short -17696
-+ .short -17696+384
-+ .byte 102
-+ .byte 25
-+ .byte 52
-+ .byte 129
-+YCbCr42xToRGB565_DITHER12_CONSTS_NEON:
-+ .short -14240+128
-+ .short -14240+256
-+ .short 8672+64
-+ .short 8672+128
-+ .short -17696+128
-+ .short -17696+256
-+ .byte 102
-+ .byte 25
-+ .byte 52
-+ .byte 129
-+YCbCr42xToRGB565_DITHER21_CONSTS_NEON:
-+ .short -14240+256
-+ .short -14240+128
-+ .short 8672+128
-+ .short 8672+64
-+ .short -17696+256
-+ .short -17696+128
-+ .byte 102
-+ .byte 25
-+ .byte 52
-+ .byte 129
-+YCbCr42xToRGB565_DITHER30_CONSTS_NEON:
-+ .short -14240+384
-+ .short -14240
-+ .short 8672+192
-+ .short 8672
-+ .short -17696+384
-+ .short -17696
-+ .byte 102
-+ .byte 25
-+ .byte 52
-+ .byte 129
-+
-+@ void ScaleYCbCr42xToRGB565_BilinearY_Row_NEON(
-+@ yuv2rgb565_row_scale_bilinear_ctx *ctx, int dither);
-+@
-+@ ctx = {
-+@ uint16_t *rgb_row; /*r0*/
-+@ const uint8_t *y_row; /*r1*/
-+@ const uint8_t *u_row; /*r2*/
-+@ const uint8_t *v_row; /*r3*/
-+@ int y_yweight; /*r4*/
-+@ int y_pitch; /*r5*/
-+@ int width; /*r6*/
-+@ int source_x0_q16; /*r7*/
-+@ int source_dx_q16; /*r8*/
-+@ int source_uv_xoffs_q16; /*r9*/
-+@ };
-+ .global ScaleYCbCr42xToRGB565_BilinearY_Row_NEON
-+ .type ScaleYCbCr42xToRGB565_BilinearY_Row_NEON, %function
-+ .balign 64
+ .arch armv7-a
+ .fpu neon
+ /* Allow to build on targets not supporting neon, and force the object file
+@@ -74,7 +80,8 @@ YCbCr42xToRGB565_DITHER30_CONSTS_NEON:
+ .global ScaleYCbCr42xToRGB565_BilinearY_Row_NEON
+ .type ScaleYCbCr42xToRGB565_BilinearY_Row_NEON, %function
+ .balign 64
+- .fnstart
+ .cfi_startproc
+ UNWIND .fnstart
-+ScaleYCbCr42xToRGB565_BilinearY_Row_NEON:
-+ STMFD r13!,{r4-r9,r14} @ 8 words.
-+ ADR r14,YCbCr42xToRGB565_DITHER03_CONSTS_NEON
-+ VPUSH {Q4-Q7} @ 16 words.
-+ ADD r14,r14,r1, LSL #4 @ Select the dither table to use
-+ LDMIA r0, {r0-r9}
-+ @ Set up image index registers.
-+ ADD r12,r8, r8
-+ VMOV.I32 D16,#0 @ Q8 = < 2| 2| 0| 0>*source_dx_q16
-+ VDUP.32 D17,r12
-+ ADD r12,r12,r12
-+ VTRN.32 D16,D17 @ Q2 = < 2| 0| 2| 0>*source_dx_q16
-+ VDUP.32 D19,r12 @ Q9 = < 4| 4| ?| ?>*source_dx_q16
-+ ADD r12,r12,r12
-+ VDUP.32 Q0, r7 @ Q0 = < 1| 1| 1| 1>*source_x0_q16
-+ VADD.I32 D17,D17,D19 @ Q8 = < 6| 4| 2| 0>*source_dx_q16
-+ CMP r8, #0 @ If source_dx_q16 is negative...
-+ VDUP.32 Q9, r12 @ Q9 = < 8| 8| 8| 8>*source_dx_q16
-+ ADDLT r7, r7, r8, LSL #4 @ Make r7 point to the end of the block
-+ VADD.I32 Q0, Q0, Q8 @ Q0 = < 6| 4| 2| 0>*source_dx_q16+source_x0_q16
-+ SUBLT r7, r7, r8 @ (i.e., the lowest address we'll use)
-+ VADD.I32 Q1, Q0, Q9 @ Q1 = <14|12|10| 8>*source_dx_q16+source_x0_q16
-+ VDUP.I32 Q9, r8 @ Q8 = < 1| 1| 1| 1>*source_dx_q16
-+ VADD.I32 Q2, Q0, Q9 @ Q2 = < 7| 5| 3| 1>*source_dx_q16+source_x0_q16
-+ VADD.I32 Q3, Q1, Q9 @ Q3 = <15|13|11| 9>*source_dx_q16+source_x0_q16
-+ VLD1.64 {D30,D31},[r14,:128] @ Load some constants
-+ VMOV.I8 D28,#52
-+ VMOV.I8 D29,#129
-+ @ The basic idea here is to do aligned loads of a block of data and then
-+ @ index into it using VTBL to extract the data from the source X
-+ @ coordinate corresponding to each destination pixel.
-+ @ This is significantly less code and significantly fewer cycles than doing
-+ @ a series of single-lane loads, but it means that the X step between
-+ @ pixels must be limited to 2.0 or less, otherwise we couldn't guarantee
-+ @ that we could read 8 pixels from a single aligned 32-byte block of data.
-+ @ Q0...Q3 contain the 16.16 fixed-point X coordinates of each pixel,
-+ @ separated into even pixels and odd pixels to make extracting offsets and
-+ @ weights easier.
-+ @ We then pull out two bytes from the middle of each coordinate: the top
-+ @ byte corresponds to the integer part of the X coordinate, and the bottom
-+ @ byte corresponds to the weight to use for bilinear blending.
-+ @ These are separated out into different registers with VTRN.
-+ @ Then by subtracting the integer X coordinate of the first pixel in the
-+ @ data block we loaded, we produce an index register suitable for use by
-+ @ VTBL.
-+s42xbily_neon_loop:
-+ @ Load the Y' data.
-+ MOV r12,r7, ASR #16
-+ VRSHRN.S32 D16,Q0, #8
-+ AND r12,r12,#~15 @ Read 16-byte aligned blocks
-+ VDUP.I8 D20,r12
-+ ADD r12,r1, r12 @ r12 = y_row+(source_x&~7)
-+ VRSHRN.S32 D17,Q1, #8
-+ PLD [r12,#64]
-+ VLD1.64 {D8, D9, D10,D11},[r12,:128],r5 @ Load Y' top row
-+ ADD r14,r7, r8, LSL #3
-+ VRSHRN.S32 D18,Q2, #8
-+ MOV r14,r14,ASR #16
-+ VRSHRN.S32 D19,Q3, #8
-+ AND r14,r14,#~15 @ Read 16-byte aligned blocks
-+ VLD1.64 {D12,D13,D14,D15},[r12,:128] @ Load Y' bottom row
-+ PLD [r12,#64]
-+ VDUP.I8 D21,r14
-+ ADD r14,r1, r14 @ r14 = y_row+(source_x&~7)
-+ VMOV.I8 Q13,#1
-+ PLD [r14,#64]
-+ VTRN.8 Q8, Q9 @ Q8 = <wFwEwDwCwBwAw9w8w7w6w5w4w3w2w1w0>
-+ @ Q9 = <xFxExDxCxBxAx9x8x7x6x5x4x3x2x1x0>
-+ VSUB.S8 Q9, Q9, Q10 @ Make offsets relative to the data we loaded.
-+ @ First 8 Y' pixels
-+ VTBL.8 D20,{D8, D9, D10,D11},D18 @ Index top row at source_x
-+ VTBL.8 D24,{D12,D13,D14,D15},D18 @ Index bottom row at source_x
-+ VADD.S8 Q13,Q9, Q13 @ Add 1 to source_x
-+ VTBL.8 D22,{D8, D9, D10,D11},D26 @ Index top row at source_x+1
-+ VTBL.8 D26,{D12,D13,D14,D15},D26 @ Index bottom row at source_x+1
-+ @ Next 8 Y' pixels
-+ VLD1.64 {D8, D9, D10,D11},[r14,:128],r5 @ Load Y' top row
-+ VLD1.64 {D12,D13,D14,D15},[r14,:128] @ Load Y' bottom row
-+ PLD [r14,#64]
-+ VTBL.8 D21,{D8, D9, D10,D11},D19 @ Index top row at source_x
-+ VTBL.8 D25,{D12,D13,D14,D15},D19 @ Index bottom row at source_x
-+ VTBL.8 D23,{D8, D9, D10,D11},D27 @ Index top row at source_x+1
-+ VTBL.8 D27,{D12,D13,D14,D15},D27 @ Index bottom row at source_x+1
-+ @ Blend Y'.
-+ VDUP.I16 Q9, r4 @ Load the y weights.
-+ VSUBL.U8 Q4, D24,D20 @ Q5:Q4 = c-a
-+ VSUBL.U8 Q5, D25,D21
-+ VSUBL.U8 Q6, D26,D22 @ Q7:Q6 = d-b
-+ VSUBL.U8 Q7, D27,D23
-+ VMUL.S16 Q4, Q4, Q9 @ Q5:Q4 = (c-a)*yweight
-+ VMUL.S16 Q5, Q5, Q9
-+ VMUL.S16 Q6, Q6, Q9 @ Q7:Q6 = (d-b)*yweight
-+ VMUL.S16 Q7, Q7, Q9
-+ VMOVL.U8 Q12,D16 @ Promote the x weights to 16 bits.
-+ VMOVL.U8 Q13,D17 @ Sadly, there's no VMULW.
-+ VRSHRN.S16 D8, Q4, #8 @ Q4 = (c-a)*yweight+128>>8
-+ VRSHRN.S16 D9, Q5, #8
-+ VRSHRN.S16 D12,Q6, #8 @ Q6 = (d-b)*yweight+128>>8
-+ VRSHRN.S16 D13,Q7, #8
-+ VADD.I8 Q10,Q10,Q4 @ Q10 = a+((c-a)*yweight+128>>8)
-+ VADD.I8 Q11,Q11,Q6 @ Q11 = b+((d-b)*yweight+128>>8)
-+ VSUBL.U8 Q4, D22,D20 @ Q5:Q4 = b-a
-+ VSUBL.U8 Q5, D23,D21
-+ VMUL.S16 Q4, Q4, Q12 @ Q5:Q4 = (b-a)*xweight
-+ VMUL.S16 Q5, Q5, Q13
-+ VRSHRN.S16 D8, Q4, #8 @ Q4 = (b-a)*xweight+128>>8
-+ ADD r12,r7, r9
-+ VRSHRN.S16 D9, Q5, #8
-+ MOV r12,r12,ASR #17
-+ VADD.I8 Q8, Q10,Q4 @ Q8 = a+((b-a)*xweight+128>>8)
-+ @ Start extracting the chroma x coordinates, and load Cb and Cr.
-+ AND r12,r12,#~15 @ Read 16-byte aligned blocks
-+ VDUP.I32 Q9, r9 @ Q9 = source_uv_xoffs_q16 x 4
-+ ADD r14,r2, r12
-+ VADD.I32 Q10,Q0, Q9
-+ VLD1.64 {D8, D9, D10,D11},[r14,:128] @ Load Cb
-+ PLD [r14,#64]
-+ VADD.I32 Q11,Q1, Q9
-+ ADD r14,r3, r12
-+ VADD.I32 Q12,Q2, Q9
-+ VLD1.64 {D12,D13,D14,D15},[r14,:128] @ Load Cr
-+ PLD [r14,#64]
-+ VADD.I32 Q13,Q3, Q9
-+ VRSHRN.S32 D20,Q10,#9 @ Q10 = <xEwExCwCxAwAx8w8x6w6x4w4x2w2x0w0>
-+ VRSHRN.S32 D21,Q11,#9
-+ VDUP.I8 Q9, r12
-+ VRSHRN.S32 D22,Q12,#9 @ Q11 = <xFwFxDwDxBwBx9w9x7w7x5w5x3w3x1w1>
-+ VRSHRN.S32 D23,Q13,#9
-+ @ We don't actually need the x weights, but we get them for free.
-+ @ Free ALU slot
-+ VTRN.8 Q10,Q11 @ Q10 = <wFwEwDwCwBwAw9w8w7w6w5w4w3w2w1w0>
-+ @ Free ALU slot @ Q11 = <xFxExDxCxBxAx9x8x7x6x5x4x3x2x1x0>
-+ VSUB.S8 Q11,Q11,Q9 @ Make offsets relative to the data we loaded.
-+ VTBL.8 D18,{D8, D9, D10,D11},D22 @ Index Cb at source_x
-+ VMOV.I8 D24,#74
-+ VTBL.8 D19,{D8, D9, D10,D11},D23
-+ VMOV.I8 D26,#102
-+ VTBL.8 D20,{D12,D13,D14,D15},D22 @ Index Cr at source_x
-+ VMOV.I8 D27,#25
-+ VTBL.8 D21,{D12,D13,D14,D15},D23
-+ @ We now have Y' in Q8, Cb in Q9, and Cr in Q10
-+ @ We use VDUP to expand constants, because it's a permute instruction, so
-+ @ it can dual issue on the A8.
-+ SUBS r6, r6, #16 @ width -= 16
-+ VMULL.U8 Q4, D16,D24 @ Q5:Q4 = Y'*74
-+ VDUP.32 Q6, D30[1] @ Q7:Q6 = bias_G
-+ VMULL.U8 Q5, D17,D24
-+ VDUP.32 Q7, D30[1]
-+ VMLSL.U8 Q6, D18,D27 @ Q7:Q6 = -25*Cb+bias_G
-+ VDUP.32 Q11,D30[0] @ Q12:Q11 = bias_R
-+ VMLSL.U8 Q7, D19,D27
-+ VDUP.32 Q12,D30[0]
-+ VMLAL.U8 Q11,D20,D26 @ Q12:Q11 = 102*Cr+bias_R
-+ VDUP.32 Q8, D31[0] @ Q13:Q8 = bias_B
-+ VMLAL.U8 Q12,D21,D26
-+ VDUP.32 Q13,D31[0]
-+ VMLAL.U8 Q8, D18,D29 @ Q13:Q8 = 129*Cb+bias_B
-+ VMLAL.U8 Q13,D19,D29
-+ VMLSL.U8 Q6, D20,D28 @ Q7:Q6 = -25*Cb-52*Cr+bias_G
-+ VMLSL.U8 Q7, D21,D28
-+ VADD.S16 Q11,Q4, Q11 @ Q12:Q11 = 74*Y'+102*Cr+bias_R
-+ VADD.S16 Q12,Q5, Q12
-+ VQADD.S16 Q8, Q4, Q8 @ Q13:Q8 = 74*Y'+129*Cr+bias_B
-+ VQADD.S16 Q13,Q5, Q13
-+ VADD.S16 Q6, Q4, Q6 @ Q7:Q6 = 74*Y'-25*Cb-52*Cr+bias_G
-+ VADD.S16 Q7, Q5, Q7
-+ @ Push each value to the top of its word and saturate it.
-+ VQSHLU.S16 Q11,Q11,#2
-+ VQSHLU.S16 Q12,Q12,#2
-+ VQSHLU.S16 Q6, Q6, #2
-+ VQSHLU.S16 Q7, Q7, #2
-+ VQSHLU.S16 Q8, Q8, #2
-+ VQSHLU.S16 Q13,Q13,#2
-+ @ Merge G and B into R.
-+ VSRI.U16 Q11,Q6, #5
-+ VSRI.U16 Q12,Q7, #5
-+ VSRI.U16 Q11,Q8, #11
-+ MOV r14,r8, LSL #4
-+ VSRI.U16 Q12,Q13,#11
-+ BLT s42xbily_neon_tail
-+ VDUP.I32 Q13,r14
-+ @ Store the result.
-+ VST1.16 {D22,D23,D24,D25},[r0]!
-+ BEQ s42xbily_neon_done
-+ @ Advance the x coordinates.
-+ VADD.I32 Q0, Q0, Q13
-+ VADD.I32 Q1, Q1, Q13
-+ ADD r7, r14
-+ VADD.I32 Q2, Q2, Q13
-+ VADD.I32 Q3, Q3, Q13
-+ B s42xbily_neon_loop
-+s42xbily_neon_tail:
-+ @ We have between 1 and 15 pixels left to write.
-+ @ -r6 == the number of pixels we need to skip writing.
-+ @ Adjust r0 to point to the last one we need to write, because we're going
-+ @ to write them in reverse order.
-+ ADD r0, r0, r6, LSL #1
-+ MOV r14,#-2
-+ ADD r0, r0, #30
-+ @ Skip past the ones we don't need to write.
-+ SUB PC, PC, r6, LSL #2
-+ ORR r0, r0, r0
-+ VST1.16 {D25[3]},[r0,:16],r14
-+ VST1.16 {D25[2]},[r0,:16],r14
-+ VST1.16 {D25[1]},[r0,:16],r14
-+ VST1.16 {D25[0]},[r0,:16],r14
-+ VST1.16 {D24[3]},[r0,:16],r14
-+ VST1.16 {D24[2]},[r0,:16],r14
-+ VST1.16 {D24[1]},[r0,:16],r14
-+ VST1.16 {D24[0]},[r0,:16],r14
-+ VST1.16 {D23[3]},[r0,:16],r14
-+ VST1.16 {D23[2]},[r0,:16],r14
-+ VST1.16 {D23[1]},[r0,:16],r14
-+ VST1.16 {D23[0]},[r0,:16],r14
-+ VST1.16 {D22[3]},[r0,:16],r14
-+ VST1.16 {D22[2]},[r0,:16],r14
-+ VST1.16 {D22[1]},[r0,:16],r14
-+ VST1.16 {D22[0]},[r0,:16]
-+s42xbily_neon_done:
-+ VPOP {Q4-Q7} @ 16 words.
-+ LDMFD r13!,{r4-r9,PC} @ 8 words.
+ ScaleYCbCr42xToRGB565_BilinearY_Row_NEON:
+ STMFD r13!,{r4-r9,r14} @ 8 words.
+ ADR r14,YCbCr42xToRGB565_DITHER03_CONSTS_NEON
+@@ -296,9 +303,10 @@ s42xbily_neon_tail:
+ s42xbily_neon_done:
+ VPOP {Q4-Q7} @ 16 words.
+ LDMFD r13!,{r4-r9,PC} @ 8 words.
+- .fnend
+ UNWIND .fnend
+ .cfi_endproc
-+ .size ScaleYCbCr42xToRGB565_BilinearY_Row_NEON, .-ScaleYCbCr42xToRGB565_BilinearY_Row_NEON
-+
+ .size ScaleYCbCr42xToRGB565_BilinearY_Row_NEON, .-ScaleYCbCr42xToRGB565_BilinearY_Row_NEON
+
+-#if defined(__ELF__)&&defined(__linux__)
+#if defined(__ELF__)&&(defined(__linux__) || defined(__NetBSD__))
-+ .section .note.GNU-stack,"",%progbits
-+#endif
+ .section .note.GNU-stack,"",%progbits
+ #endif
diff --git a/security/tor-browser/patches/patch-image_decoders_nsJPEGDecoder.cpp b/security/tor-browser/patches/patch-image_decoders_nsJPEGDecoder.cpp
index f8c4b3aa589..008af97035e 100644
--- a/security/tor-browser/patches/patch-image_decoders_nsJPEGDecoder.cpp
+++ b/security/tor-browser/patches/patch-image_decoders_nsJPEGDecoder.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-image_decoders_nsJPEGDecoder.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-image_decoders_nsJPEGDecoder.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- image/decoders/nsJPEGDecoder.cpp.orig 2015-05-04 00:43:19.000000000 +0000
+--- image/decoders/nsJPEGDecoder.cpp.orig 2015-08-07 15:54:06.000000000 +0000
+++ image/decoders/nsJPEGDecoder.cpp
@@ -23,13 +23,28 @@
@@ -50,7 +50,7 @@ $NetBSD: patch-image_decoders_nsJPEGDecoder.cpp,v 1.1 2016/02/14 07:30:54 ryoon
break;
case JCS_CMYK:
case JCS_YCCK:
-@@ -450,6 +469,15 @@ nsJPEGDecoder::WriteInternal(const char*
+@@ -448,6 +467,16 @@ nsJPEGDecoder::WriteInternal(const char*
return; // I/O suspension
}
@@ -63,10 +63,11 @@ $NetBSD: patch-image_decoders_nsJPEGDecoder.cpp,v 1.1 2016/02/14 07:30:54 ryoon
+ mInfo.cconvert->color_convert = ycc_rgb_convert_argb;
+ }
+#endif
-
++
// If this is a progressive JPEG ...
mState = mInfo.buffered_image ?
-@@ -632,7 +660,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus
+ JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL;
+@@ -629,7 +658,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus
MOZ_ASSERT(imageRow, "Should have a row buffer here");
@@ -78,10 +79,10 @@ $NetBSD: patch-image_decoders_nsJPEGDecoder.cpp,v 1.1 2016/02/14 07:30:54 ryoon
// Special case: scanline will be directly converted into packed ARGB
if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) {
*suspend = true; // suspend
-@@ -959,6 +991,282 @@ term_source (j_decompress_ptr jd)
+@@ -953,6 +986,282 @@ term_source (j_decompress_ptr jd)
+ } // namespace image
} // namespace mozilla
-
+#ifndef JCS_EXTENSIONS
+/**************** YCbCr -> Cairo's RGB24/ARGB32 conversion: most common case **************/
+
diff --git a/security/tor-browser/patches/patch-intl_hyphenation_glue_hnjalloc.h b/security/tor-browser/patches/patch-intl_hyphenation_glue_hnjalloc.h
new file mode 100644
index 00000000000..9422da1bbc9
--- /dev/null
+++ b/security/tor-browser/patches/patch-intl_hyphenation_glue_hnjalloc.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-intl_hyphenation_glue_hnjalloc.h,v 1.1 2017/01/22 12:27:22 ryoon Exp $
+
+--- intl/hyphenation/glue/hnjalloc.h.orig 2015-12-04 00:36:54.000000000 +0000
++++ intl/hyphenation/glue/hnjalloc.h
+@@ -24,6 +24,9 @@
+ */
+
+ #include <stdio.h> /* ensure stdio.h is loaded before our macros */
++#ifdef __sun
++#include <wchar.h>
++#endif
+
+ #undef FILE
+ #define FILE hnjFile
diff --git a/security/tor-browser/patches/patch-intl_hyphenation_hnjalloc.h b/security/tor-browser/patches/patch-intl_hyphenation_hnjalloc.h
deleted file mode 100644
index a6ca68eef8e..00000000000
--- a/security/tor-browser/patches/patch-intl_hyphenation_hnjalloc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-intl_hyphenation_hnjalloc.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- intl/hyphenation/hnjalloc.h.orig 2014-11-21 03:37:31.000000000 +0000
-+++ intl/hyphenation/hnjalloc.h
-@@ -24,6 +24,9 @@
- */
-
- #include <stdio.h> /* ensure stdio.h is loaded before our macros */
-+#ifdef __sun
-+#include <wchar.h>
-+#endif
-
- #undef FILE
- #define FILE hnjFile
diff --git a/security/tor-browser/patches/patch-intl_unicharutil_util_moz.build b/security/tor-browser/patches/patch-intl_unicharutil_util_moz.build
deleted file mode 100644
index a1141c9d4c6..00000000000
--- a/security/tor-browser/patches/patch-intl_unicharutil_util_moz.build
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-intl_unicharutil_util_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- intl/unicharutil/util/moz.build.orig 2015-03-27 02:20:20.000000000 +0000
-+++ intl/unicharutil/util/moz.build
-@@ -38,5 +38,8 @@ if CONFIG['_MSC_VER']:
- if CONFIG['ENABLE_INTL_API']:
- CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
-
-+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
-+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
- if CONFIG['GNU_CXX']:
- FAIL_ON_WARNINGS = True
diff --git a/security/tor-browser/patches/patch-ipc_chromium_Makefile.in b/security/tor-browser/patches/patch-ipc_chromium_Makefile.in
deleted file mode 100644
index ce6fc5822a7..00000000000
--- a/security/tor-browser/patches/patch-ipc_chromium_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ipc_chromium_Makefile.in,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- ipc/chromium/Makefile.in.orig 2014-05-29 23:30:52.000000000 +0000
-+++ ipc/chromium/Makefile.in
-@@ -28,6 +28,8 @@ include $(topsrcdir)/config/rules.mk
-
- ifdef MOZ_NATIVE_LIBEVENT # {
-
-+OS_CPPFLAGS += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS))
-+
- export-preqs = \
- $(call mkdir_deps,$(CURDIR)/third_party/libevent) \
- $(NULL)
diff --git a/security/tor-browser/patches/patch-ipc_chromium_moz.build b/security/tor-browser/patches/patch-ipc_chromium_moz.build
deleted file mode 100644
index a74507d1d68..00000000000
--- a/security/tor-browser/patches/patch-ipc_chromium_moz.build
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ipc_chromium_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
-Don't assume cocoa toolkit just because OS_ARCH is Darwin.
-
---- ipc/chromium/moz.build.orig 2014-05-06 22:55:41.000000000 +0000
-+++ ipc/chromium/moz.build
-@@ -19,7 +19,10 @@ if CONFIG['OS_ARCH'] == 'WINNT':
- else:
- os_posix = 1
- if CONFIG['OS_ARCH'] == 'Darwin':
-- os_macosx = 1
-+ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-+ os_macosx = 1
-+ else:
-+ os_bsd = 1
- elif CONFIG['OS_ARCH'] == 'DragonFly':
- os_dragonfly = 1
- os_bsd = 1
diff --git a/security/tor-browser/patches/patch-ipc_chromium_src_base_atomicops.h b/security/tor-browser/patches/patch-ipc_chromium_src_base_atomicops.h
index 5086327bc0e..3be0a5024de 100644
--- a/security/tor-browser/patches/patch-ipc_chromium_src_base_atomicops.h
+++ b/security/tor-browser/patches/patch-ipc_chromium_src_base_atomicops.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-ipc_chromium_src_base_atomicops.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_atomicops.h,v 1.2 2017/01/22 12:27:22 ryoon Exp $
* Avoid invalid cast errors under NetBSD/evbearmv7hf-el.
diff --git a/security/tor-browser/patches/patch-ipc_chromium_src_base_file__util.h b/security/tor-browser/patches/patch-ipc_chromium_src_base_file__util.h
deleted file mode 100644
index 0d3a6657c73..00000000000
--- a/security/tor-browser/patches/patch-ipc_chromium_src_base_file__util.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- ipc/chromium/src/base/file_util.h.orig 2013-12-05 16:07:35.000000000 +0000
-+++ ipc/chromium/src/base/file_util.h
-@@ -16,7 +16,9 @@
- #include <sys/stat.h>
- #elif defined(OS_POSIX)
- #include <sys/types.h>
-+#if !defined(OS_SOLARIS)
- #include <fts.h>
-+#endif
- #include <sys/stat.h>
- #endif
-
diff --git a/security/tor-browser/patches/patch-ipc_chromium_src_base_file__util__posix.cc b/security/tor-browser/patches/patch-ipc_chromium_src_base_file__util__posix.cc
index 3acbef4939b..f9b8cb5f8f3 100644
--- a/security/tor-browser/patches/patch-ipc_chromium_src_base_file__util__posix.cc
+++ b/security/tor-browser/patches/patch-ipc_chromium_src_base_file__util__posix.cc
@@ -1,38 +1,11 @@
-$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2017/01/22 12:27:22 ryoon Exp $
* Just because OS_ARCH is Darwin does not mean MacOS X specific
implementation should be used.
---- ipc/chromium/src/base/file_util_posix.cc.orig 2014-05-06 22:55:41.000000000 +0000
+--- ipc/chromium/src/base/file_util_posix.cc.orig 2015-08-07 15:54:10.000000000 +0000
+++ ipc/chromium/src/base/file_util_posix.cc
-@@ -8,7 +8,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <fnmatch.h>
--#ifndef ANDROID
-+#if !defined(ANDROID) && !defined(OS_SOLARIS)
- #include <fts.h>
- #endif
- #include <libgen.h>
-@@ -67,7 +67,7 @@ bool Delete(const FilePath& path, bool r
- if (!recursive)
- return (rmdir(path_str) == 0);
-
--#ifdef ANDROID
-+#if defined(ANDROID) || defined(OS_SOLARIS)
- // XXX Need ftsless impl for bionic
- return false;
- #else
-@@ -140,7 +140,7 @@ bool CopyDirectory(const FilePath& from_
- return false;
- }
-
--#ifdef ANDROID
-+#if defined(ANDROID) || defined(OS_SOLARIS)
- // XXX Need ftsless impl for bionic
- return false;
- #else
-@@ -435,7 +435,7 @@ bool SetCurrentDirectory(const FilePath&
+@@ -266,7 +266,7 @@ bool SetCurrentDirectory(const FilePath&
return !ret;
}
@@ -41,7 +14,7 @@ $NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.1 2016/02/14 07:30
bool GetTempDir(FilePath* path) {
const char* tmp = getenv("TMPDIR");
if (tmp)
-@@ -499,6 +499,6 @@ bool CopyFile(const FilePath& from_path,
+@@ -330,6 +330,6 @@ bool CopyFile(const FilePath& from_path,
return result;
}
diff --git a/security/tor-browser/patches/patch-ipc_chromium_src_base_message__loop.cc b/security/tor-browser/patches/patch-ipc_chromium_src_base_message__loop.cc
index 5077a27da12..7c0a3524997 100644
--- a/security/tor-browser/patches/patch-ipc_chromium_src_base_message__loop.cc
+++ b/security/tor-browser/patches/patch-ipc_chromium_src_base_message__loop.cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-ipc_chromium_src_base_message__loop.cc,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_message__loop.cc,v 1.2 2017/01/22 12:27:22 ryoon Exp $
Don't assume cocoa toolkit just because OS_ARCH is Darwin.
diff --git a/security/tor-browser/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc b/security/tor-browser/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc
new file mode 100644
index 00000000000..487da44f398
--- /dev/null
+++ b/security/tor-browser/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc
@@ -0,0 +1,22 @@
+$NetBSD: patch-ipc_chromium_src_base_message__pump__libevent.cc,v 1.1 2017/01/22 12:27:22 ryoon Exp $
+
+Allow older libevent
+
+--- ipc/chromium/src/base/message_pump_libevent.cc.orig 2016-01-23 23:23:38.000000000 +0000
++++ ipc/chromium/src/base/message_pump_libevent.cc
+@@ -20,6 +20,7 @@
+
+ // This macro checks that the _EVENT_SIZEOF_* constants defined in
+ // ipc/chromiume/src/third_party/<platform>/event2/event-config.h are correct.
++#if 0
+ #define CHECK_EVENT_SIZEOF(TYPE, type) \
+ static_assert(_EVENT_SIZEOF_##TYPE == sizeof(type), \
+ "bad _EVENT_SIZEOF_"#TYPE);
+@@ -30,6 +31,7 @@ CHECK_EVENT_SIZEOF(PTHREAD_T, pthread_t)
+ CHECK_EVENT_SIZEOF(SHORT, short);
+ CHECK_EVENT_SIZEOF(SIZE_T, size_t);
+ CHECK_EVENT_SIZEOF(VOID_P, void*);
++#endif
+
+ // Lifecycle of struct event
+ // Libevent uses two main data structures:
diff --git a/security/tor-browser/patches/patch-ipc_chromium_src_base_platform__thread.h b/security/tor-browser/patches/patch-ipc_chromium_src_base_platform__thread.h
index 64ac92a4b77..8f76c9863c1 100644
--- a/security/tor-browser/patches/patch-ipc_chromium_src_base_platform__thread.h
+++ b/security/tor-browser/patches/patch-ipc_chromium_src_base_platform__thread.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- ipc/chromium/src/base/platform_thread.h.orig 2013-09-10 03:43:34.000000000 +0000
+++ ipc/chromium/src/base/platform_thread.h
diff --git a/security/tor-browser/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc b/security/tor-browser/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
index 59371d76403..9ccbaeb23a6 100644
--- a/security/tor-browser/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
+++ b/security/tor-browser/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
@@ -1,11 +1,11 @@
-$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.2 2017/01/22 12:27:22 ryoon Exp $
* Just because OS_ARCH is Darwin does not mean MacOS X specific
kludges are needed.
---- ipc/chromium/src/base/platform_thread_posix.cc.orig 2014-05-06 22:55:41.000000000 +0000
+--- ipc/chromium/src/base/platform_thread_posix.cc.orig 2016-02-25 23:01:54.000000000 +0000
+++ ipc/chromium/src/base/platform_thread_posix.cc
-@@ -9,8 +9,12 @@
+@@ -9,22 +9,24 @@
#if defined(OS_MACOSX)
#include <mach/mach.h>
@@ -18,8 +18,6 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.1 2016/02/14
#elif defined(OS_LINUX)
#include <sys/syscall.h>
#include <sys/prctl.h>
-@@ -19,15 +23,13 @@
- #include <sys/thr.h>
#endif
-#if !defined(OS_MACOSX)
@@ -35,7 +33,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.1 2016/02/14
namespace base {
void InitThreading();
} // namespace
-@@ -91,7 +93,7 @@ void PlatformThread::Sleep(int duration_
+@@ -82,7 +84,7 @@ void PlatformThread::Sleep(int duration_
sleep_time = remaining;
}
@@ -44,7 +42,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.1 2016/02/14
// Mac is implemented in platform_thread_mac.mm.
// static
-@@ -114,19 +116,41 @@ void PlatformThread::SetName(const char*
+@@ -105,19 +107,41 @@ void PlatformThread::SetName(const char*
pthread_setname_np(pthread_self(), "%s", (void *)name);
#elif defined(OS_BSD) && !defined(__GLIBC__)
pthread_set_name_np(pthread_self(), name);
diff --git a/security/tor-browser/patches/patch-ipc_chromium_src_base_process__util.h b/security/tor-browser/patches/patch-ipc_chromium_src_base_process__util.h
index e2b5d3b3a10..d7ca719e654 100644
--- a/security/tor-browser/patches/patch-ipc_chromium_src_base_process__util.h
+++ b/security/tor-browser/patches/patch-ipc_chromium_src_base_process__util.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- ipc/chromium/src/base/process_util.h.orig 2015-01-09 04:38:16.000000000 +0000
+++ ipc/chromium/src/base/process_util.h
diff --git a/security/tor-browser/patches/patch-ipc_chromium_src_base_process__util__bsd.cc b/security/tor-browser/patches/patch-ipc_chromium_src_base_process__util__bsd.cc
index d517f096b83..c7affee8ff8 100644
--- a/security/tor-browser/patches/patch-ipc_chromium_src_base_process__util__bsd.cc
+++ b/security/tor-browser/patches/patch-ipc_chromium_src_base_process__util__bsd.cc
@@ -1,17 +1,18 @@
-$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.2 2017/01/22 12:27:22 ryoon Exp $
Darwin does not provide kvm_getprocs(3). The code for OS_MACOSX is
simply copied from process_util_mac.mm
---- ipc/chromium/src/base/process_util_bsd.cc.orig 2014-10-11 09:06:28.000000000 +0000
+--- ipc/chromium/src/base/process_util_bsd.cc.orig 2016-02-25 23:01:54.000000000 +0000
+++ ipc/chromium/src/base/process_util_bsd.cc
-@@ -9,6 +9,9 @@
+@@ -10,6 +10,10 @@
+ #include <spawn.h>
#include <sys/wait.h>
- #include <fcntl.h>
+#if defined(OS_BSD)
+#include <kvm.h>
+#endif
- #include <unistd.h>
-
++
#include <string>
+
+ #include "base/eintr_wrapper.h"
diff --git a/security/tor-browser/patches/patch-ipc_chromium_src_base_process__util__posix.cc b/security/tor-browser/patches/patch-ipc_chromium_src_base_process__util__posix.cc
index 47622b200ae..13c07961ea2 100644
--- a/security/tor-browser/patches/patch-ipc_chromium_src_base_process__util__posix.cc
+++ b/security/tor-browser/patches/patch-ipc_chromium_src_base_process__util__posix.cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-ipc_chromium_src_base_process__util__posix.cc,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_process__util__posix.cc,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- ipc/chromium/src/base/process_util_posix.cc.orig 2013-05-11 19:19:32.000000000 +0000
+++ ipc/chromium/src/base/process_util_posix.cc
diff --git a/security/tor-browser/patches/patch-ipc_chromium_src_base_scoped__nsautorelease__pool.h b/security/tor-browser/patches/patch-ipc_chromium_src_base_scoped__nsautorelease__pool.h
index d855ac38b25..aef3ecc62a2 100644
--- a/security/tor-browser/patches/patch-ipc_chromium_src_base_scoped__nsautorelease__pool.h
+++ b/security/tor-browser/patches/patch-ipc_chromium_src_base_scoped__nsautorelease__pool.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-ipc_chromium_src_base_scoped__nsautorelease__pool.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_scoped__nsautorelease__pool.h,v 1.2 2017/01/22 12:27:22 ryoon Exp $
Just because OS_ARCH is Darwin does not mean ScopedNSAutoreleasePool
is needed.
diff --git a/security/tor-browser/patches/patch-ipc_chromium_src_base_sys__info__posix.cc b/security/tor-browser/patches/patch-ipc_chromium_src_base_sys__info__posix.cc
index 49ed52ad7b7..b6662419cb5 100644
--- a/security/tor-browser/patches/patch-ipc_chromium_src_base_sys__info__posix.cc
+++ b/security/tor-browser/patches/patch-ipc_chromium_src_base_sys__info__posix.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- ipc/chromium/src/base/sys_info_posix.cc.orig 2014-04-18 02:03:04.000000000 +0000
+--- ipc/chromium/src/base/sys_info_posix.cc.orig 2016-01-15 01:01:44.000000000 +0000
+++ ipc/chromium/src/base/sys_info_posix.cc
@@ -119,7 +119,11 @@ std::wstring SysInfo::GetEnvVar(const wc
@@ -14,15 +14,3 @@ $NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.1 2016/02/14 07:30:
if (uname(&info) < 0) {
NOTREACHED();
return "";
-@@ -129,7 +133,11 @@ std::string SysInfo::OperatingSystemName
-
- // static
- std::string SysInfo::OperatingSystemVersion() {
-+#ifdef OS_SOLARIS
-+ struct utsname info;
-+#else
- utsname info;
-+#endif
- if (uname(&info) < 0) {
- NOTREACHED();
- return "";
diff --git a/security/tor-browser/patches/patch-ipc_chromium_src_base_time__posix.cc b/security/tor-browser/patches/patch-ipc_chromium_src_base_time__posix.cc
index 184b42ee933..3670eb7b516 100644
--- a/security/tor-browser/patches/patch-ipc_chromium_src_base_time__posix.cc
+++ b/security/tor-browser/patches/patch-ipc_chromium_src_base_time__posix.cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-ipc_chromium_src_base_time__posix.cc,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_time__posix.cc,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- ipc/chromium/src/base/time_posix.cc.orig 2013-05-11 19:19:32.000000000 +0000
+++ ipc/chromium/src/base/time_posix.cc
diff --git a/security/tor-browser/patches/patch-ipc_chromium_src_build_build__config.h b/security/tor-browser/patches/patch-ipc_chromium_src_build_build__config.h
index f6cf43eaf48..1279e1c847e 100644
--- a/security/tor-browser/patches/patch-ipc_chromium_src_build_build__config.h
+++ b/security/tor-browser/patches/patch-ipc_chromium_src_build_build__config.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- ipc/chromium/src/build/build_config.h.orig 2013-05-11 19:19:32.000000000 +0000
+++ ipc/chromium/src/build/build_config.h
diff --git a/security/tor-browser/patches/patch-ipc_chromium_src_chrome_common_transport__dib.h b/security/tor-browser/patches/patch-ipc_chromium_src_chrome_common_transport__dib.h
index beea141f781..7656303e42a 100644
--- a/security/tor-browser/patches/patch-ipc_chromium_src_chrome_common_transport__dib.h
+++ b/security/tor-browser/patches/patch-ipc_chromium_src_chrome_common_transport__dib.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-ipc_chromium_src_chrome_common_transport__dib.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_chrome_common_transport__dib.h,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- ipc/chromium/src/chrome/common/transport_dib.h.orig 2013-05-11 19:19:32.000000000 +0000
+++ ipc/chromium/src/chrome/common/transport_dib.h
diff --git a/security/tor-browser/patches/patch-ipc_glue_GeckoChildProcessHost.cpp b/security/tor-browser/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
index d2da0bb142e..190314df9db 100644
--- a/security/tor-browser/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
+++ b/security/tor-browser/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
* Just because OS_ARCH is Darwin does not mean MacOS X specific
kludges are needed.
diff --git a/security/tor-browser/patches/patch-ipc_glue_ScopedXREEmbed.cpp b/security/tor-browser/patches/patch-ipc_glue_ScopedXREEmbed.cpp
deleted file mode 100644
index 1526addee9a..00000000000
--- a/security/tor-browser/patches/patch-ipc_glue_ScopedXREEmbed.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ipc_glue_ScopedXREEmbed.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
-Walking out of [subprocess].app/Contents/MacOS would only be needed if
-we were using the cocoa toolkit.
-
---- ipc/glue/ScopedXREEmbed.cpp.orig 2014-05-06 22:55:41.000000000 +0000
-+++ ipc/glue/ScopedXREEmbed.cpp
-@@ -66,7 +66,7 @@ ScopedXREEmbed::Start()
- localFile = do_QueryInterface(parent);
- NS_ENSURE_TRUE_VOID(localFile);
-
--#ifdef OS_MACOSX
-+#ifdef MOZ_WIDGET_COCOA
- if (XRE_GetProcessType() == GeckoProcessType_Content) {
- // We're an XPCOM-using subprocess. Walk out of
- // [subprocess].app/Contents/MacOS to the real GRE dir.
diff --git a/security/tor-browser/patches/patch-ipc_glue_StringUtil.cpp b/security/tor-browser/patches/patch-ipc_glue_StringUtil.cpp
index 94505c243c8..5287de45b9c 100644
--- a/security/tor-browser/patches/patch-ipc_glue_StringUtil.cpp
+++ b/security/tor-browser/patches/patch-ipc_glue_StringUtil.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-ipc_glue_StringUtil.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-ipc_glue_StringUtil.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
Just because OS_ARCH is Darwin does not mean
sys_string_conversions_mac.mm can be used.
diff --git a/security/tor-browser/patches/patch-ipc_glue_moz.build b/security/tor-browser/patches/patch-ipc_glue_moz.build
index 159840c75d2..e578380ab7f 100644
--- a/security/tor-browser/patches/patch-ipc_glue_moz.build
+++ b/security/tor-browser/patches/patch-ipc_glue_moz.build
@@ -1,14 +1,14 @@
-$NetBSD: patch-ipc_glue_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-ipc_glue_moz.build,v 1.2 2017/01/22 12:27:22 ryoon Exp $
Don't assume cocoa toolkit just because OS_ARCH is Darwin.
---- ipc/glue/moz.build.orig 2015-01-29 12:45:33.000000000 +0000
+--- ipc/glue/moz.build.orig 2015-06-18 20:55:28.000000000 +0000
+++ ipc/glue/moz.build
@@ -87,7 +87,7 @@ elif CONFIG['OS_ARCH'] in ('DragonFly',
UNIFIED_SOURCES += [
'ProcessUtils_bsd.cpp'
]
--elif CONFIG['OS_ARCH'] in ('Darwin'):
+-elif CONFIG['OS_ARCH'] == 'Darwin':
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
UNIFIED_SOURCES += [
'ProcessUtils_mac.mm'
diff --git a/security/tor-browser/patches/patch-ipc_ipdl_ipdl_cxx_ast.py b/security/tor-browser/patches/patch-ipc_ipdl_ipdl_cxx_ast.py
deleted file mode 100644
index b625d1698ee..00000000000
--- a/security/tor-browser/patches/patch-ipc_ipdl_ipdl_cxx_ast.py
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ipc_ipdl_ipdl_cxx_ast.py,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
-Part of https://bugzilla.mozilla.org/show_bug.cgi?id=1026499:
-Make sure storage provided for attributes is properly aligned
-in the generated C++ code.
-
---- ipc/ipdl/ipdl/cxx/ast.py.orig 2014-07-17 01:45:18.000000000 +0000
-+++ ipc/ipdl/ipdl/cxx/ast.py
-@@ -336,12 +336,13 @@ Type.VOID = Type('void')
- Type.VOIDPTR = Type('void', ptr=1)
-
- class TypeArray(Node):
-- def __init__(self, basetype, nmemb):
-- '''the type |basetype DECLNAME[nmemb]|. |nmemb| is an Expr'''
-+ def __init__(self, basetype, nmemb, alignType):
-+ '''the type |basetype DECLNAME[nmemb]|. |nmemb| is an Expr, |alignType| is a type'''
- self.basetype = basetype
- self.nmemb = nmemb
-+ self.alignType = alignType
- def __deepcopy__(self, memo):
-- return TypeArray(deepcopy(self.basetype, memo), nmemb)
-+ return TypeArray(deepcopy(self.basetype, memo), nmemb, alignType)
-
- class TypeEnum(Node):
- def __init__(self, name=None):
diff --git a/security/tor-browser/patches/patch-ipc_ipdl_ipdl_cxx_cgen.py b/security/tor-browser/patches/patch-ipc_ipdl_ipdl_cxx_cgen.py
deleted file mode 100644
index 2726317f39e..00000000000
--- a/security/tor-browser/patches/patch-ipc_ipdl_ipdl_cxx_cgen.py
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ipc_ipdl_ipdl_cxx_cgen.py,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
-Part of https://bugzilla.mozilla.org/show_bug.cgi?id=1026499:
-Make sure storage provided for attributes is properly aligned
-in the generated C++ code.
-
---- ipc/ipdl/ipdl/cxx/cgen.py.orig 2014-07-17 01:45:18.000000000 +0000
-+++ ipc/ipdl/ipdl/cxx/cgen.py
-@@ -101,6 +101,7 @@ class CxxCodeGen(CodePrinter, Visitor):
- def visitDecl(self, d):
- # C-syntax arrays make code generation much more annoying
- if isinstance(d.type, TypeArray):
-+ self.write('MOZ_ALIGNED_DECL(')
- d.type.basetype.accept(self)
- else:
- d.type.accept(self)
-@@ -111,7 +112,9 @@ class CxxCodeGen(CodePrinter, Visitor):
- if isinstance(d.type, TypeArray):
- self.write('[')
- d.type.nmemb.accept(self)
-- self.write(']')
-+ self.write('], MOZ_ALIGNOF(')
-+ d.type.alignType.accept(self)
-+ self.write('))')
-
- def visitParam(self, p):
- self.visitDecl(p)
diff --git a/security/tor-browser/patches/patch-ipc_ipdl_ipdl_lower.py b/security/tor-browser/patches/patch-ipc_ipdl_ipdl_lower.py
deleted file mode 100644
index 51645c052d8..00000000000
--- a/security/tor-browser/patches/patch-ipc_ipdl_ipdl_lower.py
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ipc_ipdl_ipdl_lower.py,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
-Part of https://bugzilla.mozilla.org/show_bug.cgi?id=1026499:
-Make sure storage provided for attributes is properly aligned
-in the generated C++ code.
-
---- ipc/ipdl/ipdl/lower.py.orig 2014-07-17 01:45:18.000000000 +0000
-+++ ipc/ipdl/ipdl/lower.py
-@@ -768,7 +768,7 @@ IPDL union type."""
- if self.recursive:
- return self.ptrToType()
- else:
-- return TypeArray(Type('char'), ExprSizeof(self.internalType()))
-+ return TypeArray(Type('char'), ExprSizeof(self.internalType()), self.internalType())
-
- def unionValue(self):
- # NB: knows that Union's storage C union is named |mValue|
diff --git a/security/tor-browser/patches/patch-js__src__vm__SPSProfiler.cpp b/security/tor-browser/patches/patch-js__src__vm__SPSProfiler.cpp
index 3657dacbb48..42bfbaa71cc 100644
--- a/security/tor-browser/patches/patch-js__src__vm__SPSProfiler.cpp
+++ b/security/tor-browser/patches/patch-js__src__vm__SPSProfiler.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-js__src__vm__SPSProfiler.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-js__src__vm__SPSProfiler.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
Unclear fallout from our version of bug 840242, attachment v1: some architectures
fail to link if we do not add the inlines here - might be compiler/arch specific.
diff --git a/security/tor-browser/patches/patch-js_public_CallArgs.h b/security/tor-browser/patches/patch-js_public_CallArgs.h
deleted file mode 100644
index 8805e1dbeb1..00000000000
--- a/security/tor-browser/patches/patch-js_public_CallArgs.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-js_public_CallArgs.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- js/public/CallArgs.h.orig 2015-04-29 21:11:43.000000000 +0000
-+++ js/public/CallArgs.h
-@@ -344,7 +344,7 @@ class MOZ_STACK_CLASS CallArgs : public
- * Returns true if there are at least |required| arguments passed in. If
- * false, it reports an error message on the context.
- */
-- bool requireAtLeast(JSContext* cx, const char* fnname, unsigned required);
-+ JS_PUBLIC_API(bool) requireAtLeast(JSContext* cx, const char* fnname, unsigned required);
-
- };
-
diff --git a/security/tor-browser/patches/patch-js_src_Makefile.in b/security/tor-browser/patches/patch-js_src_Makefile.in
deleted file mode 100644
index a789c64d191..00000000000
--- a/security/tor-browser/patches/patch-js_src_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-js_src_Makefile.in,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- js/src/Makefile.in.orig 2015-02-17 21:40:38.000000000 +0000
-+++ js/src/Makefile.in
-@@ -16,9 +16,6 @@ TOPLEVEL_BUILD := 1
-
- run_for_side_effects := $(shell echo 'MAKE: $(MAKE)')
-
--DIST_INSTALL = 1
--NO_EXPAND_LIBS = 1
--
- ifdef JS_HAS_CTYPES
- ifdef MOZ_NATIVE_FFI
- LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS)
diff --git a/security/tor-browser/patches/patch-js_src_asmjs_AsmJSSignalHandlers.cpp b/security/tor-browser/patches/patch-js_src_asmjs_AsmJSSignalHandlers.cpp
deleted file mode 100644
index 1c58f69e8ec..00000000000
--- a/security/tor-browser/patches/patch-js_src_asmjs_AsmJSSignalHandlers.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-js_src_asmjs_AsmJSSignalHandlers.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
-Increase portability for non-x86 Darwin by not hardwiring
-x86_THREAD_STATE.
-
---- js/src/asmjs/AsmJSSignalHandlers.cpp.orig 2015-05-04 00:43:23.000000000 +0000
-+++ js/src/asmjs/AsmJSSignalHandlers.cpp
-@@ -637,10 +637,11 @@ HandleMachException(JSRuntime* rt, const
- mach_port_t rtThread = request.body.thread.name;
-
- // Read out the JSRuntime thread's register state.
-- x86_thread_state_t state;
-- unsigned int count = x86_THREAD_STATE_COUNT;
-+ moz_platform_thread_state_t state;
-+ thread_state_flavor_t flavor = MOZ_PLATFORM_THREAD_STATE_FLAVOR;
-+ mach_msg_type_number_t count = MOZ_PLATFORM_THREAD_STATE_COUNT;
- kern_return_t kret;
-- kret = thread_get_state(rtThread, x86_THREAD_STATE, (thread_state_t)&state, &count);
-+ kret = thread_get_state(rtThread, flavor, (thread_state_t)&state, &count);
- if (kret != KERN_SUCCESS)
- return false;
-
diff --git a/security/tor-browser/patches/patch-js_src_ctypes_CTypes.h b/security/tor-browser/patches/patch-js_src_ctypes_CTypes.h
index aa2e23a26cd..2e519e40c16 100644
--- a/security/tor-browser/patches/patch-js_src_ctypes_CTypes.h
+++ b/security/tor-browser/patches/patch-js_src_ctypes_CTypes.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-js_src_ctypes_CTypes.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-js_src_ctypes_CTypes.h,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- js/src/ctypes/CTypes.h.orig 2014-02-12 21:29:02.000000000 +0000
+++ js/src/ctypes/CTypes.h
diff --git a/security/tor-browser/patches/patch-js_src_frontend_ParseMaps.cpp b/security/tor-browser/patches/patch-js_src_frontend_ParseMaps.cpp
index 7c225419800..06e6a2eadff 100644
--- a/security/tor-browser/patches/patch-js_src_frontend_ParseMaps.cpp
+++ b/security/tor-browser/patches/patch-js_src_frontend_ParseMaps.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-js_src_frontend_ParseMaps.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-js_src_frontend_ParseMaps.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- js/src/frontend/ParseMaps.cpp.orig 2013-09-10 03:43:34.000000000 +0000
+++ js/src/frontend/ParseMaps.cpp
diff --git a/security/tor-browser/patches/patch-js_src_gc_Statistics.cpp b/security/tor-browser/patches/patch-js_src_gc_Statistics.cpp
deleted file mode 100644
index d77aaf022be..00000000000
--- a/security/tor-browser/patches/patch-js_src_gc_Statistics.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-js_src_gc_Statistics.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- js/src/gc/Statistics.cpp.orig 2015-02-05 11:52:40.000000000 +0000
-+++ js/src/gc/Statistics.cpp 2015-02-05 11:52:28.000000000 +0000
-@@ -221,8 +221,8 @@
- while (*c) {
- if (*c == ' ' || *c == '\t')
- p('_');
-- else if (isupper(*c))
-- p(tolower(*c));
-+ else if (isupper((unsigned char)*c))
-+ p(tolower((unsigned char)*c));
- else if (*c == '+')
- p("added_");
- else if (*c == '-')
diff --git a/security/tor-browser/patches/patch-js_src_jit-LIR.cpp b/security/tor-browser/patches/patch-js_src_jit-LIR.cpp
index 3e6c05ed676..5711c396bd0 100644
--- a/security/tor-browser/patches/patch-js_src_jit-LIR.cpp
+++ b/security/tor-browser/patches/patch-js_src_jit-LIR.cpp
@@ -1,13 +1,13 @@
-$NetBSD: patch-js_src_jit-LIR.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-js_src_jit-LIR.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- js/src/jit/LIR.cpp.orig 2015-05-04 00:43:27.000000000 +0000
+--- js/src/jit/LIR.cpp.orig 2015-08-24 21:53:12.000000000 +0000
+++ js/src/jit/LIR.cpp
-@@ -323,7 +323,7 @@ LNode::printName(FILE* fp, Opcode op)
+@@ -323,7 +323,7 @@ LNode::printName(GenericPrinter& out, Op
const char* name = names[op];
size_t len = strlen(name);
for (size_t i = 0; i < len; i++)
-- fprintf(fp, "%c", tolower(name[i]));
-+ fprintf(fp, "%c", tolower(((unsigned char)name[i])));
+- out.printf("%c", tolower(name[i]));
++ out.printf("%c", tolower((unsigned char)name[i]));
}
void
diff --git a/security/tor-browser/patches/patch-js_src_jit_ExecutableAllocator.h b/security/tor-browser/patches/patch-js_src_jit_ExecutableAllocator.h
deleted file mode 100644
index 78dae23fd8f..00000000000
--- a/security/tor-browser/patches/patch-js_src_jit_ExecutableAllocator.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-js_src_jit_ExecutableAllocator.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- js/src/jit/ExecutableAllocator.h.orig 2015-05-04 00:43:27.000000000 +0000
-+++ js/src/jit/ExecutableAllocator.h
-@@ -419,6 +419,11 @@ class ExecutableAllocator {
- {
- __clear_cache(code, reinterpret_cast<char*>(code) + size);
- }
-+#elif defined(JS_CODEGEN_ARM) && (defined(__FreeBSD__) || defined(__NetBSD__))
-+ static void cacheFlush(void* code, size_t size)
-+ {
-+ __clear_cache(code, reinterpret_cast<char*>(code) + size);
-+ }
- #elif defined(JS_CODEGEN_ARM) && (defined(__linux__) || defined(ANDROID)) && defined(__GNUC__)
- static void cacheFlush(void* code, size_t size)
- {
diff --git a/security/tor-browser/patches/patch-js_src_jit_MIR.cpp b/security/tor-browser/patches/patch-js_src_jit_MIR.cpp
index 861d8f8f74e..6106c54ae04 100644
--- a/security/tor-browser/patches/patch-js_src_jit_MIR.cpp
+++ b/security/tor-browser/patches/patch-js_src_jit_MIR.cpp
@@ -1,13 +1,13 @@
-$NetBSD: patch-js_src_jit_MIR.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-js_src_jit_MIR.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- js/src/jit/MIR.cpp.orig 2015-05-04 00:43:27.000000000 +0000
+--- js/src/jit/MIR.cpp.orig 2015-08-24 21:53:12.000000000 +0000
+++ js/src/jit/MIR.cpp
-@@ -71,7 +71,7 @@ MDefinition::PrintOpcodeName(FILE* fp, M
+@@ -72,7 +72,7 @@ MDefinition::PrintOpcodeName(GenericPrin
const char* name = names[op];
size_t len = strlen(name);
for (size_t i = 0; i < len; i++)
-- fprintf(fp, "%c", tolower(name[i]));
-+ fprintf(fp, "%c", tolower(((unsigned char)name[i])));
+- out.printf("%c", tolower(name[i]));
++ out.printf("%c", tolower((unsigned char)name[i]));
}
const Value&
diff --git a/security/tor-browser/patches/patch-js_src_jit_arm_Architecture-arm.cpp b/security/tor-browser/patches/patch-js_src_jit_arm_Architecture-arm.cpp
index ee9fcfbd811..010a78c482a 100644
--- a/security/tor-browser/patches/patch-js_src_jit_arm_Architecture-arm.cpp
+++ b/security/tor-browser/patches/patch-js_src_jit_arm_Architecture-arm.cpp
@@ -1,12 +1,12 @@
-$NetBSD: patch-js_src_jit_arm_Architecture-arm.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-js_src_jit_arm_Architecture-arm.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- js/src/jit/arm/Architecture-arm.cpp.orig 2015-05-04 00:43:27.000000000 +0000
+--- js/src/jit/arm/Architecture-arm.cpp.orig 2015-08-24 21:53:12.000000000 +0000
+++ js/src/jit/arm/Architecture-arm.cpp
@@ -16,7 +16,7 @@
#include "jit/arm/Assembler-arm.h"
#include "jit/RegisterSets.h"
--#if !defined(__linux__) || defined(ANDROID) || defined(JS_ARM_SIMULATOR)
+-#if !defined(__linux__) || defined(ANDROID) || defined(JS_SIMULATOR_ARM)
+#if !defined(__linux__) || defined(ANDROID) || defined(JS_ARM_SIMULATOR) || defined(__NetBSD__)
// The Android NDK and B2G do not include the hwcap.h kernel header, and it is not
// defined when building the simulator, so inline the header defines we need.
diff --git a/security/tor-browser/patches/patch-js_src_jsapi.cpp b/security/tor-browser/patches/patch-js_src_jsapi.cpp
deleted file mode 100644
index c74698b96f8..00000000000
--- a/security/tor-browser/patches/patch-js_src_jsapi.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-js_src_jsapi.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- js/src/jsapi.cpp.orig 2015-04-29 21:11:46.000000000 +0000
-+++ js/src/jsapi.cpp
-@@ -115,7 +115,7 @@ using js::frontend::Parser;
- #define JS_ADDRESSOF_VA_LIST(ap) (&(ap))
- #endif
-
--bool
-+JS_PUBLIC_API(bool)
- JS::CallArgs::requireAtLeast(JSContext* cx, const char* fnname, unsigned required) {
- if (length() < required) {
- char numArgsStr[40];
diff --git a/security/tor-browser/patches/patch-js_src_jsdate.cpp b/security/tor-browser/patches/patch-js_src_jsdate.cpp
index bd9b25f09d2..a2fa8f7849f 100644
--- a/security/tor-browser/patches/patch-js_src_jsdate.cpp
+++ b/security/tor-browser/patches/patch-js_src_jsdate.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-js_src_jsdate.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-js_src_jsdate.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- js/src/jsdate.cpp.orig 2015-02-17 21:40:42.000000000 +0000
+--- js/src/jsdate.cpp.orig 2016-02-25 23:02:04.000000000 +0000
+++ js/src/jsdate.cpp
-@@ -2651,11 +2651,11 @@ ToLocaleFormatHelper(JSContext *cx, Hand
+@@ -2672,8 +2672,8 @@ ToLocaleFormatHelper(JSContext* cx, Hand
if (strcmp(format, "%x") == 0 && result_len >= 6 &&
/* Format %x means use OS settings, which may have 2-digit yr, so
hack end of 3/11/22 or 11.03.22 or 11Mar22 to use 4-digit yr...*/
@@ -11,10 +11,5 @@ $NetBSD: patch-js_src_jsdate.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+ !isdigit(((unsigned char)buf[result_len - 3])) &&
+ isdigit(((unsigned char)buf[result_len - 2])) && isdigit(((unsigned char)buf[result_len - 1])) &&
/* ...but not if starts with 4-digit year, like 2022/3/11. */
-- !(isdigit(buf[0]) && isdigit(buf[1]) &&
-- isdigit(buf[2]) && isdigit(buf[3]))) {
-+ !(isdigit(((unsigned char)buf[0])) && isdigit(((unsigned char)buf[1])) &&
-+ isdigit(((unsigned char)buf[2])) && isdigit(((unsigned char)buf[3])))) {
- double localtime = obj->as<DateObject>().cachedLocalTime(&cx->runtime()->dateTimeInfo);
- int year = IsNaN(localtime) ? 0 : (int) YearFromTime(localtime);
- JS_snprintf(buf + (result_len - 2), (sizeof buf) - (result_len - 2),
+ !(isdigit(buf[0]) && isdigit(buf[1]) &&
+ isdigit(buf[2]) && isdigit(buf[3]))) {
diff --git a/security/tor-browser/patches/patch-js_src_jskwgen.cpp b/security/tor-browser/patches/patch-js_src_jskwgen.cpp
index 749854943eb..85bee4fcd96 100644
--- a/security/tor-browser/patches/patch-js_src_jskwgen.cpp
+++ b/security/tor-browser/patches/patch-js_src_jskwgen.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-js_src_jskwgen.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-js_src_jskwgen.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- js/src/jskwgen.cpp.orig 2015-01-23 06:00:01.000000000 +0000
+++ js/src/jskwgen.cpp 2015-02-05 11:42:30.000000000 +0000
diff --git a/security/tor-browser/patches/patch-js_src_jsmath.cpp b/security/tor-browser/patches/patch-js_src_jsmath.cpp
index c5ed1b8d386..e3dcd45a796 100644
--- a/security/tor-browser/patches/patch-js_src_jsmath.cpp
+++ b/security/tor-browser/patches/patch-js_src_jsmath.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-js_src_jsmath.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-js_src_jsmath.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- js/src/jsmath.cpp.orig 2013-09-10 03:43:36.000000000 +0000
+++ js/src/jsmath.cpp
diff --git a/security/tor-browser/patches/patch-js_src_shell_jsoptparse.cpp b/security/tor-browser/patches/patch-js_src_shell_jsoptparse.cpp
index 14a650ca8c4..2ee976581a4 100644
--- a/security/tor-browser/patches/patch-js_src_shell_jsoptparse.cpp
+++ b/security/tor-browser/patches/patch-js_src_shell_jsoptparse.cpp
@@ -1,9 +1,9 @@
-$NetBSD: patch-js_src_shell_jsoptparse.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-js_src_shell_jsoptparse.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- js/src/shell/jsoptparse.cpp.orig 2015-05-04 00:43:27.000000000 +0000
+--- js/src/shell/jsoptparse.cpp.orig 2015-06-18 20:55:32.000000000 +0000
+++ js/src/shell/jsoptparse.cpp
-@@ -90,7 +90,7 @@ PrintParagraph(const char* text, unsigne
- printf("%*s", startColno, "");
+@@ -95,7 +95,7 @@ PrintParagraph(const char* text, unsigne
+ ++it;
while (*it != '\0') {
- MOZ_ASSERT(!isspace(*it));
diff --git a/security/tor-browser/patches/patch-js_xpconnect_src_XPCConvert.cpp b/security/tor-browser/patches/patch-js_xpconnect_src_XPCConvert.cpp
index d0b5f6e8c31..b3b9a8653ad 100644
--- a/security/tor-browser/patches/patch-js_xpconnect_src_XPCConvert.cpp
+++ b/security/tor-browser/patches/patch-js_xpconnect_src_XPCConvert.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-js_xpconnect_src_XPCConvert.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-js_xpconnect_src_XPCConvert.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
Suggested workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1147837
Avoids a crash on big endian 64 bit architectures.
diff --git a/security/tor-browser/patches/patch-js_xpconnect_src_xpcprivate.h b/security/tor-browser/patches/patch-js_xpconnect_src_xpcprivate.h
index 38146041659..86970eca56d 100644
--- a/security/tor-browser/patches/patch-js_xpconnect_src_xpcprivate.h
+++ b/security/tor-browser/patches/patch-js_xpconnect_src_xpcprivate.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-js_xpconnect_src_xpcprivate.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-js_xpconnect_src_xpcprivate.h,v 1.2 2017/01/22 12:27:22 ryoon Exp $
From commit log 1.1:
Instantiate WeakMapPtr explicitly to get the right visibility with
diff --git a/security/tor-browser/patches/patch-media_libcubeb_AUTHORS b/security/tor-browser/patches/patch-media_libcubeb_AUTHORS
deleted file mode 100644
index 22b41688a9d..00000000000
--- a/security/tor-browser/patches/patch-media_libcubeb_AUTHORS
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-media_libcubeb_AUTHORS,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- media/libcubeb/AUTHORS.orig 2014-10-11 09:06:39.000000000 +0000
-+++ media/libcubeb/AUTHORS
-@@ -4,3 +4,4 @@ Michael Wu <mwu@mozilla.com>
- Paul Adenot <paul@paul.cx>
- David Richards <drichards@mozilla.com>
- Sebastien Alaiwan <sebastien.alaiwan@gmail.com>
-+Evgeniy Vodolazskiy <waterlaz@gmail.com>
diff --git a/security/tor-browser/patches/patch-media_libcubeb_src_cubeb.c b/security/tor-browser/patches/patch-media_libcubeb_src_cubeb.c
index 71895a1e3a6..3f487db4aad 100644
--- a/security/tor-browser/patches/patch-media_libcubeb_src_cubeb.c
+++ b/security/tor-browser/patches/patch-media_libcubeb_src_cubeb.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_libcubeb_src_cubeb.c,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb.c,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- media/libcubeb/src/cubeb.c.orig 2014-10-11 09:06:39.000000000 +0000
+--- media/libcubeb/src/cubeb.c.orig 2016-02-25 23:01:58.000000000 +0000
+++ media/libcubeb/src/cubeb.c
-@@ -54,6 +54,9 @@ int opensl_init(cubeb ** context, char c
- #if defined(USE_AUDIOTRACK)
- int audiotrack_init(cubeb ** context, char const * context_name);
+@@ -60,6 +60,9 @@ int audiotrack_init(cubeb ** context, ch
+ #if defined(USE_KAI)
+ int kai_init(cubeb ** context, char const * context_name);
#endif
+#if defined(USE_OSS)
+int oss_init(cubeb ** context, char const * context_name);
@@ -12,9 +12,9 @@ $NetBSD: patch-media_libcubeb_src_cubeb.c,v 1.1 2016/02/14 07:30:54 ryoon Exp $
int
validate_stream_params(cubeb_stream_params stream_params)
-@@ -120,6 +123,9 @@ cubeb_init(cubeb ** context, char const
- #if defined(USE_AUDIOTRACK)
- audiotrack_init,
+@@ -129,6 +132,9 @@ cubeb_init(cubeb ** context, char const
+ #if defined(USE_KAI)
+ kai_init,
#endif
+#if defined(USE_OSS)
+ oss_init,
diff --git a/security/tor-browser/patches/patch-media_libcubeb_src_cubeb__alsa.c b/security/tor-browser/patches/patch-media_libcubeb_src_cubeb__alsa.c
index 0b3d74acd6b..f5559c36cf9 100644
--- a/security/tor-browser/patches/patch-media_libcubeb_src_cubeb__alsa.c
+++ b/security/tor-browser/patches/patch-media_libcubeb_src_cubeb__alsa.c
@@ -1,7 +1,7 @@
-$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- media/libcubeb/src/cubeb_alsa.c.orig 2015-05-08 16:55:17.000000000 +0000
-+++ media/libcubeb/src/cubeb_alsa.c 2015-05-14 15:22:34.000000000 +0000
+--- media/libcubeb/src/cubeb_alsa.c.orig 2016-02-25 23:01:58.000000000 +0000
++++ media/libcubeb/src/cubeb_alsa.c
@@ -7,12 +7,18 @@
#undef NDEBUG
#define _DEFAULT_SOURCE
@@ -73,7 +73,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
/* ALSA is not thread-safe. snd_pcm_t instances are individually protected
by the owning cubeb_stream's mutex. snd_pcm_t creation and destruction
is not thread-safe until ALSA 1.0.24 (see alsa-lib.git commit 91c9c8f1),
-@@ -65,6 +116,8 @@
+@@ -65,6 +116,8 @@ struct cubeb {
workaround is not required. */
snd_config_t * local_config;
int is_pa;
@@ -82,7 +82,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
};
enum stream_state {
-@@ -258,32 +311,35 @@
+@@ -258,32 +311,35 @@ alsa_refill_stream(cubeb_stream * stm)
long got;
void * p;
int draining;
@@ -137,7 +137,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
/* This should never happen. */
if ((unsigned int) avail > stm->buffer_size) {
-@@ -294,8 +350,8 @@
+@@ -294,8 +350,8 @@ alsa_refill_stream(cubeb_stream * stm)
available to write. If avail is still zero here, the stream must be in
a funky state, so recover and try again. */
if (avail == 0) {
@@ -148,7 +148,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
if (avail <= 0) {
pthread_mutex_unlock(&stm->mutex);
stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
-@@ -303,7 +359,7 @@
+@@ -303,7 +359,7 @@ alsa_refill_stream(cubeb_stream * stm)
}
}
@@ -157,7 +157,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
assert(p);
pthread_mutex_unlock(&stm->mutex);
-@@ -312,10 +368,11 @@
+@@ -312,10 +368,11 @@ alsa_refill_stream(cubeb_stream * stm)
if (got < 0) {
pthread_mutex_unlock(&stm->mutex);
stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
@@ -170,7 +170,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
if (stm->params.format == CUBEB_SAMPLE_FLOAT32NE) {
float * b = (float *) p;
-@@ -328,14 +385,64 @@
+@@ -328,14 +385,66 @@ alsa_refill_stream(cubeb_stream * stm)
b[i] *= stm->volume;
}
}
@@ -206,15 +206,17 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
+ return ERROR;
+ }
+ continue;
-+#if defined(EBADFD)
++#if __linux__
+ case -EBADFD:
++#else
++ case -EBADF:
++#endif
+ fprintf(stderr, "%s: snc_pcm_writei returned -%s, giving up\n",
+ __func__, "EBADFD");
+ free(p);
+ stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
+ pthread_mutex_unlock(&stm->mutex);
+ return ERROR;
-+#endif
+ }
+ if (wrote < 0) {
+ fprintf(stderr, "%s: snc_pcm_writei returned unexpected error %lld, "
@@ -243,7 +245,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
}
if (got != avail) {
long buffer_fill = stm->buffer_size - (avail - got);
-@@ -343,7 +450,7 @@
+@@ -343,7 +452,7 @@ alsa_refill_stream(cubeb_stream * stm)
/* Fill the remaining buffer with silence to guarantee one full period
has been written. */
@@ -252,7 +254,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
set_timeout(&stm->drain_timeout, buffer_time * 1000);
-@@ -454,26 +561,26 @@
+@@ -454,26 +563,26 @@ get_slave_pcm_node(snd_config_t * lconf,
slave_def = NULL;
@@ -284,7 +286,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
if (r < 0) {
break;
}
-@@ -482,7 +589,7 @@
+@@ -482,7 +591,7 @@ get_slave_pcm_node(snd_config_t * lconf,
if (r < 0 || r > (int) sizeof(node_name)) {
break;
}
@@ -293,7 +295,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
if (r < 0) {
break;
}
-@@ -491,7 +598,7 @@
+@@ -491,7 +600,7 @@ get_slave_pcm_node(snd_config_t * lconf,
} while (0);
if (slave_def) {
@@ -302,7 +304,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
}
return NULL;
-@@ -514,22 +621,22 @@
+@@ -514,22 +623,22 @@ init_local_config_with_workaround(char c
lconf = NULL;
@@ -329,7 +331,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
if (r < 0) {
break;
}
-@@ -538,7 +645,7 @@
+@@ -538,7 +647,7 @@ init_local_config_with_workaround(char c
if (r < 0 || r > (int) sizeof(node_name)) {
break;
}
@@ -338,7 +340,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
if (r < 0) {
break;
}
-@@ -549,12 +656,12 @@
+@@ -549,12 +658,12 @@ init_local_config_with_workaround(char c
}
/* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */
@@ -353,7 +355,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
if (r < 0) {
break;
}
-@@ -565,18 +672,18 @@
+@@ -565,18 +674,18 @@ init_local_config_with_workaround(char c
/* Don't clobber an explicit existing handle_underrun value, set it only
if it doesn't already exist. */
@@ -375,7 +377,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
if (r < 0) {
break;
}
-@@ -584,7 +691,7 @@
+@@ -584,7 +693,7 @@ init_local_config_with_workaround(char c
return lconf;
} while (0);
@@ -384,7 +386,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
return NULL;
}
-@@ -596,9 +703,9 @@
+@@ -596,9 +705,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s
pthread_mutex_lock(&cubeb_alsa_mutex);
if (local_config) {
@@ -396,7 +398,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
}
pthread_mutex_unlock(&cubeb_alsa_mutex);
-@@ -611,7 +718,7 @@
+@@ -611,7 +720,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
int r;
pthread_mutex_lock(&cubeb_alsa_mutex);
@@ -405,7 +407,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
pthread_mutex_unlock(&cubeb_alsa_mutex);
return r;
-@@ -668,12 +775,65 @@
+@@ -668,12 +777,65 @@ alsa_init(cubeb ** context, char const *
pthread_attr_t attr;
snd_pcm_t * dummy;
@@ -472,7 +474,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
cubeb_alsa_error_handler_set = 1;
}
pthread_mutex_unlock(&cubeb_alsa_mutex);
-@@ -681,6 +841,8 @@
+@@ -681,6 +843,8 @@ alsa_init(cubeb ** context, char const *
ctx = calloc(1, sizeof(*ctx));
assert(ctx);
@@ -481,7 +483,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
ctx->ops = &alsa_ops;
r = pthread_mutex_init(&ctx->mutex, NULL);
-@@ -730,7 +892,7 @@
+@@ -730,7 +894,7 @@ alsa_init(cubeb ** context, char const *
config fails with EINVAL, the PA PCM is too old for this workaround. */
if (r == -EINVAL) {
pthread_mutex_lock(&cubeb_alsa_mutex);
@@ -490,7 +492,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
pthread_mutex_unlock(&cubeb_alsa_mutex);
ctx->local_config = NULL;
} else if (r >= 0) {
-@@ -769,9 +931,13 @@
+@@ -769,9 +933,13 @@ alsa_destroy(cubeb * ctx)
pthread_mutex_destroy(&ctx->mutex);
free(ctx->fds);
@@ -505,7 +507,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
pthread_mutex_unlock(&cubeb_alsa_mutex);
}
-@@ -839,7 +1005,7 @@
+@@ -839,7 +1007,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
return CUBEB_ERROR;
}
@@ -514,7 +516,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
assert(r == 0);
/* Ugly hack: the PA ALSA plugin allows buffer configurations that can't
-@@ -849,23 +1015,23 @@
+@@ -849,23 +1017,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
latency = latency < 500 ? 500 : latency;
}
@@ -544,7 +546,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
assert((nfds_t) r == stm->nfds);
r = pthread_cond_init(&stm->cond, NULL);
-@@ -896,7 +1062,7 @@
+@@ -896,7 +1064,7 @@ alsa_stream_destroy(cubeb_stream * stm)
pthread_mutex_lock(&stm->mutex);
if (stm->pcm) {
if (stm->state == DRAINING) {
@@ -553,7 +555,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
}
alsa_locked_pcm_close(stm->pcm);
stm->pcm = NULL;
-@@ -906,7 +1072,10 @@
+@@ -906,7 +1074,10 @@ alsa_stream_destroy(cubeb_stream * stm)
pthread_mutex_destroy(&stm->mutex);
r = pthread_cond_destroy(&stm->cond);
@@ -565,7 +567,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
alsa_unregister_stream(stm);
-@@ -938,12 +1107,12 @@
+@@ -938,12 +1109,12 @@ alsa_get_max_channel_count(cubeb * ctx,
return CUBEB_ERROR;
}
@@ -580,12 +582,12 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
if (r < 0) {
return CUBEB_ERROR;
}
-@@ -963,34 +1132,34 @@
+@@ -963,34 +1134,34 @@ alsa_get_preferred_sample_rate(cubeb * c
/* get a pcm, disabling resampling, so we get a rate the
* hardware/dmix/pulse/etc. supports. */
-- r = snd_pcm_open(&pcm, "default", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
-+ r = WRAP(snd_pcm_open)(&pcm, "default", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
+- r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
++ r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
if (r < 0) {
return CUBEB_ERROR;
}
@@ -623,7 +625,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
return CUBEB_OK;
}
-@@ -1014,7 +1183,7 @@
+@@ -1014,7 +1185,7 @@ alsa_stream_start(cubeb_stream * stm)
ctx = stm->context;
pthread_mutex_lock(&stm->mutex);
@@ -632,7 +634,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
gettimeofday(&stm->last_activity, NULL);
pthread_mutex_unlock(&stm->mutex);
-@@ -1048,7 +1217,7 @@
+@@ -1048,7 +1219,7 @@ alsa_stream_stop(cubeb_stream * stm)
pthread_mutex_unlock(&ctx->mutex);
pthread_mutex_lock(&stm->mutex);
@@ -641,7 +643,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
pthread_mutex_unlock(&stm->mutex);
return CUBEB_OK;
-@@ -1064,14 +1233,17 @@
+@@ -1064,14 +1235,17 @@ alsa_stream_get_position(cubeb_stream *
pthread_mutex_lock(&stm->mutex);
delay = -1;
@@ -662,7 +664,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2016/02/14 07:30:54 ryoon
*position = 0;
if (stm->write_position >= (snd_pcm_uframes_t) delay) {
-@@ -1090,7 +1262,7 @@
+@@ -1090,7 +1264,7 @@ alsa_stream_get_latency(cubeb_stream * s
snd_pcm_sframes_t delay;
/* This function returns the delay in frames until a frame written using
snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */
diff --git a/security/tor-browser/patches/patch-media_libcubeb_src_cubeb__oss.c b/security/tor-browser/patches/patch-media_libcubeb_src_cubeb__oss.c
index aa982cbd401..540ca7057e4 100644
--- a/security/tor-browser/patches/patch-media_libcubeb_src_cubeb__oss.c
+++ b/security/tor-browser/patches/patch-media_libcubeb_src_cubeb__oss.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- media/libcubeb/src/cubeb_oss.c.orig 2015-02-20 05:47:26.000000000 +0000
+++ media/libcubeb/src/cubeb_oss.c
diff --git a/security/tor-browser/patches/patch-media_libcubeb_src_moz.build b/security/tor-browser/patches/patch-media_libcubeb_src_moz.build
index 6f6e2b7f81e..388cc8e3bea 100644
--- a/security/tor-browser/patches/patch-media_libcubeb_src_moz.build
+++ b/security/tor-browser/patches/patch-media_libcubeb_src_moz.build
@@ -1,8 +1,8 @@
-$NetBSD: patch-media_libcubeb_src_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_moz.build,v 1.2 2017/01/22 12:27:22 ryoon Exp $
Don't assume cocoa toolkit just because OS_TARGET is Darwin.
---- media/libcubeb/src/moz.build.orig 2014-11-21 03:37:42.000000000 +0000
+--- media/libcubeb/src/moz.build.orig 2016-02-25 23:01:58.000000000 +0000
+++ media/libcubeb/src/moz.build
@@ -17,6 +17,12 @@ if CONFIG['MOZ_ALSA']:
]
@@ -25,8 +25,8 @@ Don't assume cocoa toolkit just because OS_TARGET is Darwin.
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
SOURCES += [
'cubeb_audiounit.c',
- 'cubeb_osx_run_loop.c'
-@@ -65,6 +71,9 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+ ]
+@@ -64,6 +70,9 @@ if CONFIG['OS_TARGET'] == 'Android':
FINAL_LIBRARY = 'gkmedias'
@@ -34,14 +34,11 @@ Don't assume cocoa toolkit just because OS_TARGET is Darwin.
+ SOURCES['cubeb_resampler.cpp'].flags += CONFIG['MOZ_SPEEX_CFLAGS']
+
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
- CFLAGS += [
- '-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [
-@@ -73,7 +82,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
+ if CONFIG['ANDROID_VERSION'] >= '17':
+ LOCAL_INCLUDES += [
+@@ -74,5 +83,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
+ '%' + '%s/system/media/wilhelm/include' % CONFIG['ANDROID_SOURCE'],
]
- ]
-
-+CFLAGS += CONFIG['MOZ_OSS_CFLAGS']
- FAIL_ON_WARNINGS = True
+CFLAGS += CONFIG['MOZ_OSS_CFLAGS']
CFLAGS += CONFIG['MOZ_ALSA_CFLAGS']
diff --git a/security/tor-browser/patches/patch-media_libpng_pngpriv.h b/security/tor-browser/patches/patch-media_libpng_pngpriv.h
index 4f91475e338..a1b60defba9 100644
--- a/security/tor-browser/patches/patch-media_libpng_pngpriv.h
+++ b/security/tor-browser/patches/patch-media_libpng_pngpriv.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-media_libpng_pngpriv.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_libpng_pngpriv.h,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- media/libpng/pngpriv.h.orig 2014-02-12 21:29:13.000000000 +0000
+++ media/libpng/pngpriv.h
diff --git a/security/tor-browser/patches/patch-media_libsoundtouch_src_cpu__detect__x86.cpp b/security/tor-browser/patches/patch-media_libsoundtouch_src_cpu__detect__x86.cpp
index af0c68dc3b0..e15f2351f83 100644
--- a/security/tor-browser/patches/patch-media_libsoundtouch_src_cpu__detect__x86.cpp
+++ b/security/tor-browser/patches/patch-media_libsoundtouch_src_cpu__detect__x86.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-media_libsoundtouch_src_cpu__detect__x86.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_libsoundtouch_src_cpu__detect__x86.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- media/libsoundtouch/src/cpu_detect_x86.cpp.orig 2014-04-18 02:03:48.000000000 +0000
+++ media/libsoundtouch/src/cpu_detect_x86.cpp
diff --git a/security/tor-browser/patches/patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h b/security/tor-browser/patches/patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h
new file mode 100644
index 00000000000..d031adfb231
--- /dev/null
+++ b/security/tor-browser/patches/patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h,v 1.1 2017/01/22 12:27:22 ryoon Exp $
+
+--- media/libstagefright/frameworks/av/include/media/stagefright/foundation/AString.h.orig 2015-12-08 18:06:36.000000000 +0000
++++ media/libstagefright/frameworks/av/include/media/stagefright/foundation/AString.h
+@@ -18,6 +18,7 @@
+
+ #define A_STRING_H_
+
++#include <cctype>
+ #include <sys/types.h>
+
+ namespace stagefright {
diff --git a/security/tor-browser/patches/patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp b/security/tor-browser/patches/patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp
index 02b17a7670f..0eca79cf4e3 100644
--- a/security/tor-browser/patches/patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp
+++ b/security/tor-browser/patches/patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- media/libstagefright/frameworks/av/media/libstagefright/foundation/AString.cpp.orig 2015-02-23 07:39:35.000000000 +0000
+++ media/libstagefright/frameworks/av/media/libstagefright/foundation/AString.cpp
diff --git a/security/tor-browser/patches/patch-media_libstagefright_system_core_liblog_fake__log__device.c b/security/tor-browser/patches/patch-media_libstagefright_system_core_liblog_fake__log__device.c
index 90f43ef4d2b..268f98ac0bc 100644
--- a/security/tor-browser/patches/patch-media_libstagefright_system_core_liblog_fake__log__device.c
+++ b/security/tor-browser/patches/patch-media_libstagefright_system_core_liblog_fake__log__device.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-media_libstagefright_system_core_liblog_fake__log__device.c,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_libstagefright_system_core_liblog_fake__log__device.c,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- media/libstagefright/system/core/liblog/fake_log_device.c.orig 2015-01-23 05:59:59.000000000 +0000
+++ media/libstagefright/system/core/liblog/fake_log_device.c 2015-02-16 14:09:00.000000000 +0000
diff --git a/security/tor-browser/patches/patch-media_libstagefright_system_core_liblog_logprint.c b/security/tor-browser/patches/patch-media_libstagefright_system_core_liblog_logprint.c
index 301c2f431d1..66123a00058 100644
--- a/security/tor-browser/patches/patch-media_libstagefright_system_core_liblog_logprint.c
+++ b/security/tor-browser/patches/patch-media_libstagefright_system_core_liblog_logprint.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-media_libstagefright_system_core_liblog_logprint.c,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_libstagefright_system_core_liblog_logprint.c,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- media/libstagefright/system/core/liblog/logprint.c.orig 2015-01-23 05:59:59.000000000 +0000
+++ media/libstagefright/system/core/liblog/logprint.c 2015-02-16 14:12:46.000000000 +0000
diff --git a/security/tor-browser/patches/patch-media_libtheora_lib_arm_armcpu.c b/security/tor-browser/patches/patch-media_libtheora_lib_arm_armcpu.c
index f1c9470cf5f..9a0e2826069 100644
--- a/security/tor-browser/patches/patch-media_libtheora_lib_arm_armcpu.c
+++ b/security/tor-browser/patches/patch-media_libtheora_lib_arm_armcpu.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-media_libtheora_lib_arm_armcpu.c,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_libtheora_lib_arm_armcpu.c,v 1.2 2017/01/22 12:27:22 ryoon Exp $
* NetBSD/evbearmv7hf-el's /proc/cpuinfo return empty, use hardcoded flags.
diff --git a/security/tor-browser/patches/patch-media_libtheora_lib_info.c b/security/tor-browser/patches/patch-media_libtheora_lib_info.c
index 5f732ea7a55..20c2a11696a 100644
--- a/security/tor-browser/patches/patch-media_libtheora_lib_info.c
+++ b/security/tor-browser/patches/patch-media_libtheora_lib_info.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-media_libtheora_lib_info.c,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_libtheora_lib_info.c,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- media/libtheora/lib/info.c.orig 2015-01-23 05:59:59.000000000 +0000
+++ media/libtheora/lib/info.c 2015-02-16 14:49:17.000000000 +0000
diff --git a/security/tor-browser/patches/patch-media_libtheora_moz.build b/security/tor-browser/patches/patch-media_libtheora_moz.build
index 9674dea36f3..494a9d2793e 100644
--- a/security/tor-browser/patches/patch-media_libtheora_moz.build
+++ b/security/tor-browser/patches/patch-media_libtheora_moz.build
@@ -1,10 +1,14 @@
-$NetBSD: patch-media_libtheora_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_libtheora_moz.build,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- media/libtheora/moz.build.orig 2015-02-17 21:40:41.000000000 +0000
+--- media/libtheora/moz.build.orig 2015-08-24 21:53:11.000000000 +0000
+++ media/libtheora/moz.build
-@@ -93,3 +93,5 @@ if CONFIG['GNU_AS']:
- if CONFIG['OS_TARGET'] == 'Android':
- DEFINES['__linux__'] = True
+@@ -21,6 +21,9 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+ # The encoder is currently not included.
+ DEFINES['THEORA_DISABLE_ENCODE'] = True
+if CONFIG['MOZ_NATIVE_OGG']:
+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS']
++
+ # Suppress warnings in third-party code.
+ if CONFIG['GNU_CC']:
+ CFLAGS += ['-Wno-type-limits']
diff --git a/security/tor-browser/patches/patch-media_libtremor_Makefile.in b/security/tor-browser/patches/patch-media_libtremor_Makefile.in
index f16e376faa8..f4e1e4ceeca 100644
--- a/security/tor-browser/patches/patch-media_libtremor_Makefile.in
+++ b/security/tor-browser/patches/patch-media_libtremor_Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-media_libtremor_Makefile.in,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_libtremor_Makefile.in,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- media/libtremor/Makefile.in.orig 2014-03-20 11:09:40.000000000 +0000
+++ media/libtremor/Makefile.in
diff --git a/security/tor-browser/patches/patch-media_libtremor_moz.build b/security/tor-browser/patches/patch-media_libtremor_moz.build
index 9e4480810a8..f349ccafca7 100644
--- a/security/tor-browser/patches/patch-media_libtremor_moz.build
+++ b/security/tor-browser/patches/patch-media_libtremor_moz.build
@@ -1,4 +1,4 @@
-$NetBSD: patch-media_libtremor_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_libtremor_moz.build,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- media/libtremor/moz.build.orig 2014-11-21 03:37:42.000000000 +0000
+++ media/libtremor/moz.build
diff --git a/security/tor-browser/patches/patch-media_libvorbis_Makefile.in b/security/tor-browser/patches/patch-media_libvorbis_Makefile.in
index 2ec7923f9b7..8ff593d0146 100644
--- a/security/tor-browser/patches/patch-media_libvorbis_Makefile.in
+++ b/security/tor-browser/patches/patch-media_libvorbis_Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-media_libvorbis_Makefile.in,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_libvorbis_Makefile.in,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- media/libvorbis/Makefile.in.orig 2014-03-20 11:09:40.000000000 +0000
+++ media/libvorbis/Makefile.in
diff --git a/security/tor-browser/patches/patch-media_libvorbis_lib_vorbis_info.c b/security/tor-browser/patches/patch-media_libvorbis_lib_vorbis_info.c
index d9b7539e114..b6d7b6ec0f3 100644
--- a/security/tor-browser/patches/patch-media_libvorbis_lib_vorbis_info.c
+++ b/security/tor-browser/patches/patch-media_libvorbis_lib_vorbis_info.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-media_libvorbis_lib_vorbis_info.c,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_libvorbis_lib_vorbis_info.c,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- media/libvorbis/lib/vorbis_info.c.orig 2015-01-23 05:59:59.000000000 +0000
+++ media/libvorbis/lib/vorbis_info.c 2015-02-16 14:36:05.000000000 +0000
diff --git a/security/tor-browser/patches/patch-media_libvorbis_moz.build b/security/tor-browser/patches/patch-media_libvorbis_moz.build
index 3a3463e0c09..860a817034b 100644
--- a/security/tor-browser/patches/patch-media_libvorbis_moz.build
+++ b/security/tor-browser/patches/patch-media_libvorbis_moz.build
@@ -1,4 +1,4 @@
-$NetBSD: patch-media_libvorbis_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_libvorbis_moz.build,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- media/libvorbis/moz.build.orig 2014-11-21 03:37:42.000000000 +0000
+++ media/libvorbis/moz.build
diff --git a/security/tor-browser/patches/patch-media_libyuv_include_libyuv_scale__row.h b/security/tor-browser/patches/patch-media_libyuv_include_libyuv_scale__row.h
index 125a385b08b..37b7fcf09ec 100644
--- a/security/tor-browser/patches/patch-media_libyuv_include_libyuv_scale__row.h
+++ b/security/tor-browser/patches/patch-media_libyuv_include_libyuv_scale__row.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-media_libyuv_include_libyuv_scale__row.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_libyuv_include_libyuv_scale__row.h,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- media/libyuv/include/libyuv/scale_row.h.orig 2014-11-13 22:50:11.000000000 +0000
+++ media/libyuv/include/libyuv/scale_row.h
diff --git a/security/tor-browser/patches/patch-media_mtransport_third__party_nICEr_src_util_mbslen.c b/security/tor-browser/patches/patch-media_mtransport_third__party_nICEr_src_util_mbslen.c
index e05a9b123d9..a59ca670cd6 100644
--- a/security/tor-browser/patches/patch-media_mtransport_third__party_nICEr_src_util_mbslen.c
+++ b/security/tor-browser/patches/patch-media_mtransport_third__party_nICEr_src_util_mbslen.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-media_mtransport_third__party_nICEr_src_util_mbslen.c,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_mtransport_third__party_nICEr_src_util_mbslen.c,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- media/mtransport/third_party/nICEr/src/util/mbslen.c.orig 2014-04-18 02:03:49.000000000 +0000
+--- media/mtransport/third_party/nICEr/src/util/mbslen.c.orig 2016-02-25 23:02:01.000000000 +0000
+++ media/mtransport/third_party/nICEr/src/util/mbslen.c
-@@ -54,6 +54,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- # endif
+@@ -47,6 +47,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ #define HAVE_XLOCALE
#endif
+#ifdef __DragonFly__
diff --git a/security/tor-browser/patches/patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h b/security/tor-browser/patches/patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h
index 79ee7c607a7..75d961f0130 100644
--- a/security/tor-browser/patches/patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h
+++ b/security/tor-browser/patches/patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h.orig 2014-07-17 01:45:31.000000000 +0000
+++ media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
diff --git a/security/tor-browser/patches/patch-media_openmax__dl_dl_api_armCOMM__s.h b/security/tor-browser/patches/patch-media_openmax__dl_dl_api_armCOMM__s.h
new file mode 100644
index 00000000000..439d74db03b
--- /dev/null
+++ b/security/tor-browser/patches/patch-media_openmax__dl_dl_api_armCOMM__s.h
@@ -0,0 +1,37 @@
+$NetBSD: patch-media_openmax__dl_dl_api_armCOMM__s.h,v 1.1 2017/01/22 12:27:22 ryoon Exp $
+
+--- media/openmax_dl/dl/api/armCOMM_s.h.orig 2015-09-29 21:44:56.000000000 +0000
++++ media/openmax_dl/dl/api/armCOMM_s.h
+@@ -11,6 +11,12 @@
+ @// This file was originally licensed as follows. It has been
+ @// relicensed with permission from the copyright holders.
+ @//
++
++#if defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__)
++#define UNWIND
++#else
++#define UNWIND @
++#endif
+
+ @//
+ @// File Name: armCOMM_s.h
+@@ -175,7 +181,8 @@
+ .object_arch armv4
+ .align 2
+ \name :
+-.fnstart
++ .cfi_startproc
++ UNWIND .fnstart
+ @ Save specified R registers
+ _M_GETRREGLIST \rreg
+ _M_PUSH_RREG
+@@ -202,7 +209,8 @@
+ .endif
+ @ Restore any saved R or D registers.
+ _M_RET
+- .fnend
++ UNWIND .fnend
++ .cfi_endproc
+ .endfunc
+ @ Reset the global stack tracking variables back to their
+ @ initial values.
diff --git a/security/tor-browser/patches/patch-media_webrtc_signaling_test_moz.build b/security/tor-browser/patches/patch-media_webrtc_signaling_test_common.build
index f81ff89b58d..89f0ef13667 100644
--- a/security/tor-browser/patches/patch-media_webrtc_signaling_test_moz.build
+++ b/security/tor-browser/patches/patch-media_webrtc_signaling_test_common.build
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_webrtc_signaling_test_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_webrtc_signaling_test_common.build,v 1.1 2017/01/22 12:27:22 ryoon Exp $
---- media/webrtc/signaling/test/moz.build.orig 2015-02-17 21:40:43.000000000 +0000
-+++ media/webrtc/signaling/test/moz.build
-@@ -112,15 +112,19 @@ if CONFIG['JS_SHARED_LIBRARY']:
- 'js',
- ]
+--- media/webrtc/signaling/test/common.build.orig 2015-08-07 15:54:13.000000000 +0000
++++ media/webrtc/signaling/test/common.build
+@@ -99,15 +99,19 @@ if CONFIG['JS_SHARED_LIBRARY']:
+
+ USE_LIBS += ['mozglue']
+OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS']
OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
diff --git a/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_build_common.gypi b/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_build_common.gypi
index 6be6700aa39..b398621134b 100644
--- a/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_build_common.gypi
+++ b/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_build_common.gypi
@@ -1,4 +1,4 @@
-$NetBSD: patch-media_webrtc_trunk_webrtc_build_common.gypi,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_webrtc_trunk_webrtc_build_common.gypi,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- media/webrtc/trunk/webrtc/build/common.gypi.orig 2014-04-18 02:03:52.000000000 +0000
+++ media/webrtc/trunk/webrtc/build/common.gypi
diff --git a/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi b/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi
deleted file mode 100644
index c1a8c10a89b..00000000000
--- a/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi.orig 2015-05-04 00:43:28.000000000 +0000
-+++ media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi
-@@ -17,18 +17,11 @@
- 'conditions': [
- ['build_with_mozilla==1', {
- # Mozilla provides its own build of the opus library.
-- 'include_dirs': [
-- '/media/libopus/include',
-- '/media/libopus/src',
-- '/media/libopus/celt',
-+ 'cflags_mozilla': [
-+ '$(filter -I%, $(MOZ_CELT_CFLAGS))/celt',
-+ '$(MOZ_OPUS_CFLAGS)',
-+ '$(filter -I%, $(MOZ_OPUS_CFLAGS))/../src',
- ],
-- 'direct_dependent_settings': {
-- 'include_dirs': [
-- '/media/libopus/include',
-- '/media/libopus/src',
-- '/media/libopus/celt',
-- ],
-- },
- }, {
- 'dependencies': [
- '<(DEPTH)/third_party/opus/opus.gyp:opus'
diff --git a/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_audio__coding_neteq_neteq.gypi b/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_audio__coding_neteq_neteq.gypi
index 362d5ff9136..59d301ad9d0 100644
--- a/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_audio__coding_neteq_neteq.gypi
+++ b/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_audio__coding_neteq_neteq.gypi
@@ -1,4 +1,4 @@
-$NetBSD: patch-media_webrtc_trunk_webrtc_modules_audio__coding_neteq_neteq.gypi,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_webrtc_trunk_webrtc_modules_audio__coding_neteq_neteq.gypi,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi.orig 2015-05-04 00:43:28.000000000 +0000
+++ media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi
diff --git a/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.cc b/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.cc
index d8cef8962d9..31561664b7e 100644
--- a/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.cc
+++ b/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.cc,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.cc,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.cc.orig 2014-10-11 09:06:41.000000000 +0000
+++ media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.cc
diff --git a/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.h b/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.h
index 0f937aa0a46..ecabbe92582 100644
--- a/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.h
+++ b/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.h,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.h.orig 2014-10-11 09:06:41.000000000 +0000
+++ media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.h
diff --git a/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc b/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
index cc2cb0c3b91..35e2062426b 100644
--- a/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
+++ b/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.orig 2014-05-29 23:31:23.000000000 +0000
+++ media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
diff --git a/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc b/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc
index 68bb82aa76a..d1dcf824771 100644
--- a/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc
+++ b/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc.orig 2014-05-29 23:31:23.000000000 +0000
+--- media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc.orig 2016-02-25 23:02:06.000000000 +0000
+++ media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
@@ -25,6 +25,9 @@
#else
@@ -12,8 +12,8 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__cap
#include <new>
-@@ -34,6 +37,15 @@
- #include "webrtc/system_wrappers/interface/thread_wrapper.h"
+@@ -33,6 +36,15 @@
+ #include "webrtc/system_wrappers/interface/ref_count.h"
#include "webrtc/system_wrappers/interface/trace.h"
+#ifdef HAVE_LIBV4L2
diff --git a/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi b/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi
index 913b8b46df7..096f424411c 100644
--- a/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi
+++ b/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi
@@ -1,6 +1,6 @@
-$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi.orig 2015-05-04 00:43:29.000000000 +0000
+--- media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi.orig 2016-02-25 23:02:07.000000000 +0000
+++ media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
@@ -7,6 +7,9 @@
# be found in the AUTHORS file in the root of the source tree.
@@ -12,10 +12,12 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.g
'targets': [
{
# Note this library is missing an implementation for the video capture.
-@@ -69,6 +72,19 @@
- 'linux/video_capture_linux.cc',
- 'linux/video_capture_linux.h',
+@@ -64,8 +67,32 @@
+ 'video_capture_module',
+ '<(webrtc_root)/common.gyp:webrtc_common',
],
+- 'cflags_mozilla': [
+- '$(NSPR_CFLAGS)',
+ 'conditions': [
+ ['use_libv4l2==1', {
+ 'defines': [
@@ -29,6 +31,19 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.g
+ ],
+ }],
+ ],
- }], # linux
- ['OS=="mac"', {
- 'sources': [
++ }], # linux
++ ['OS=="mac"', {
++ 'sources': [
++ 'mac/qtkit/video_capture_qtkit.h',
++ 'mac/qtkit/video_capture_qtkit.mm',
++ 'mac/qtkit/video_capture_qtkit_info.h',
++ 'mac/qtkit/video_capture_qtkit_info.mm',
++ 'mac/qtkit/video_capture_qtkit_info_objc.h',
++ 'mac/qtkit/video_capture_qtkit_info_objc.mm',
++ 'mac/qtkit/video_capture_qtkit_objc.h',
++ 'mac/qtkit/video_capture_qtkit_objc.mm',
++ 'mac/qtkit/video_capture_qtkit_utility.h',
++ 'mac/video_capture_mac.mm',
+ ],
+ 'conditions': [
+ ['include_v4l2_video_capture==1', {
diff --git a/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp b/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp
index 81b1e302fed..a60fe49f4a2 100644
--- a/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp
+++ b/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp.orig 2015-03-27 02:20:26.000000000 +0000
+--- media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp.orig 2015-08-07 15:54:15.000000000 +0000
+++ media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp
@@ -14,6 +14,13 @@ Cygwin fix provided by:
Scott McMurray
@@ -16,7 +16,7 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_s
#ifndef BOOST_SPREAD_SORT_H
#define BOOST_SPREAD_SORT_H
#include <algorithm>
-@@ -21,6 +28,13 @@ Scott McMurray
+@@ -21,10 +28,24 @@ Scott McMurray
#include <vector>
#include "webrtc/system_wrappers/source/spreadsortlib/constants.hpp"
@@ -30,3 +30,14 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_s
#ifdef getchar
#undef getchar
#endif
+
++#ifdef __FreeBSD__
++# include <osreldate.h>
++# if __FreeBSD_version < 900506
++# define getchar boost_getchar
++# endif
++#endif
++
+ namespace boost {
+ namespace detail {
+ //This only works on unsigned data types
diff --git a/security/tor-browser/patches/patch-memory_build_mozjemalloc__compat.c b/security/tor-browser/patches/patch-memory_build_mozjemalloc__compat.c
index 7989e88199a..e4d45ec3749 100644
--- a/security/tor-browser/patches/patch-memory_build_mozjemalloc__compat.c
+++ b/security/tor-browser/patches/patch-memory_build_mozjemalloc__compat.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-memory_build_mozjemalloc__compat.c,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-memory_build_mozjemalloc__compat.c,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- memory/build/mozjemalloc_compat.c.orig 2015-03-27 02:20:26.000000000 +0000
+--- memory/build/mozjemalloc_compat.c.orig 2015-12-04 00:37:04.000000000 +0000
+++ memory/build/mozjemalloc_compat.c
-@@ -131,6 +131,48 @@ compute_bin_unused(unsigned int narenas)
- return bin_unused;
+@@ -140,6 +140,48 @@ compute_bin_unused_and_bookkeeping(jemal
+ stats->bin_unused = bin_unused;
}
+static size_t
diff --git a/security/tor-browser/patches/patch-memory_jemalloc_Makefile.in b/security/tor-browser/patches/patch-memory_jemalloc_Makefile.in
deleted file mode 100644
index 6cd37a8566f..00000000000
--- a/security/tor-browser/patches/patch-memory_jemalloc_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-memory_jemalloc_Makefile.in,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- memory/jemalloc/Makefile.in.orig 2014-03-15 05:19:31.000000000 +0000
-+++ memory/jemalloc/Makefile.in
-@@ -21,3 +21,7 @@ endif
- ifdef GNU_CC
- CFLAGS += -std=gnu99
- endif
-+
-+# XXX startup crash workaround for gcc47 on amd64
-+jemalloc.$(OBJ_SUFFIX): OS_CFLAGS := $(filter-out -O3 -Ofast,$(OS_CFLAGS))
-+jemalloc.$(OBJ_SUFFIX): MOZ_OPTIMIZE_FLAGS=
diff --git a/security/tor-browser/patches/patch-memory_jemalloc_src_configure b/security/tor-browser/patches/patch-memory_jemalloc_src_configure
deleted file mode 100644
index 905e6912318..00000000000
--- a/security/tor-browser/patches/patch-memory_jemalloc_src_configure
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-memory_jemalloc_src_configure,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- memory/jemalloc/src/configure.orig 2015-03-27 02:20:26.000000000 +0000
-+++ memory/jemalloc/src/configure
-@@ -6566,7 +6566,7 @@ else
- LG_PAGE="detect"
- fi
-
--if test "x$LG_PAGE" == "xdetect"; then
-+if test "x$LG_PAGE" = "xdetect"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking LG_PAGE" >&5
- $as_echo_n "checking LG_PAGE... " >&6; }
- if ${je_cv_lg_page+:} false; then :
diff --git a/security/tor-browser/patches/patch-memory_mozalloc_mozalloc__abort.cpp b/security/tor-browser/patches/patch-memory_mozalloc_mozalloc__abort.cpp
index 4fa1c78b688..f067613e0ec 100644
--- a/security/tor-browser/patches/patch-memory_mozalloc_mozalloc__abort.cpp
+++ b/security/tor-browser/patches/patch-memory_mozalloc_mozalloc__abort.cpp
@@ -1,11 +1,11 @@
-$NetBSD: patch-memory_mozalloc_mozalloc__abort.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-memory_mozalloc_mozalloc__abort.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- memory/mozalloc/mozalloc_abort.cpp.orig 2015-01-09 04:38:22.000000000 +0000
+--- memory/mozalloc/mozalloc_abort.cpp.orig 2015-08-24 21:53:14.000000000 +0000
+++ memory/mozalloc/mozalloc_abort.cpp
-@@ -63,7 +63,11 @@ void fillAbortMessage(char (&msg)[N], ui
- // Define abort() here, so that it is used instead of the system abort(). This
- // lets us control the behavior when aborting, in order to get better results
- // on *NIX platforms. See mozalloc_abort for details.
+@@ -68,7 +68,11 @@ void fillAbortMessage(char (&msg)[N], ui
+ //
+ // That segmentation fault will be interpreted as another bug by ASan and as a
+ // result, ASan will just exit(1) instead of aborting.
+#if defined(SOLARIS)
+void std::abort(void)
+#else
diff --git a/security/tor-browser/patches/patch-memory_volatile_VolatileBufferOSX.cpp b/security/tor-browser/patches/patch-memory_volatile_VolatileBufferOSX.cpp
index 359c6309fcd..0fea5f3fe2f 100644
--- a/security/tor-browser/patches/patch-memory_volatile_VolatileBufferOSX.cpp
+++ b/security/tor-browser/patches/patch-memory_volatile_VolatileBufferOSX.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-memory_volatile_VolatileBufferOSX.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-memory_volatile_VolatileBufferOSX.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- memory/volatile/VolatileBufferOSX.cpp.orig 2015-03-27 02:20:26.000000000 +0000
+++ memory/volatile/VolatileBufferOSX.cpp
diff --git a/security/tor-browser/patches/patch-mfbt_Alignment.h b/security/tor-browser/patches/patch-mfbt_Alignment.h
deleted file mode 100644
index a1e57ea1293..00000000000
--- a/security/tor-browser/patches/patch-mfbt_Alignment.h
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-mfbt_Alignment.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
-Make MOZ_ALIGNOF() use gcc's builtin __alignof__.
-From https://bugzilla.mozilla.org/show_bug.cgi?id=1026499
-
---- mfbt/Alignment.h.orig 2014-07-17 01:45:32.000000000 +0000
-+++ mfbt/Alignment.h
-@@ -9,11 +9,20 @@
- #ifndef mozilla_Alignment_h
- #define mozilla_Alignment_h
-
-+#include "mozilla/Attributes.h"
-+
- #include <stddef.h>
- #include <stdint.h>
-
- namespace mozilla {
-
-+#if defined(MOZ_HAVE_CXX11_ALIGNAS)
-+#define MOZ_ALIGNOF(T) alignof(T)
-+#elif defined(__GNUC__)
-+#define MOZ_ALIGNOF(T) __alignof__(T)
-+#elif defined(_MSC_VER)
-+#define MOZ_ALIGNOF(T) __alignof(T)
-+#else
- /*
- * This class, and the corresponding macro MOZ_ALIGNOF, figures out how many
- * bytes of alignment a given type needs.
-@@ -32,6 +41,7 @@ class AlignmentFinder
- };
-
- #define MOZ_ALIGNOF(T) mozilla::AlignmentFinder<T>::alignment
-+#endif
-
- /*
- * Declare the MOZ_ALIGNED_DECL macro for declaring aligned types.
-@@ -43,7 +53,10 @@ class AlignmentFinder
- * will declare a two-character array |arr| aligned to 8 bytes.
- */
-
--#if defined(__GNUC__)
-+#if defined(MOZ_HAVE_CXX11_ALIGNAS)
-+# define MOZ_ALIGNED_DECL(_type, _align) \
-+ alignas(_align) _type
-+#elif defined(__GNUC__)
- # define MOZ_ALIGNED_DECL(_type, _align) \
- _type __attribute__((aligned(_align)))
- #elif defined(_MSC_VER)
diff --git a/security/tor-browser/patches/patch-mfbt_Attributes.h b/security/tor-browser/patches/patch-mfbt_Attributes.h
index 3686bc34c63..6587ad9fc4a 100644
--- a/security/tor-browser/patches/patch-mfbt_Attributes.h
+++ b/security/tor-browser/patches/patch-mfbt_Attributes.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-mfbt_Attributes.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-mfbt_Attributes.h,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- mfbt/Attributes.h.orig 2015-05-04 00:43:30.000000000 +0000
+--- mfbt/Attributes.h.orig 2015-10-22 22:30:35.000000000 +0000
+++ mfbt/Attributes.h
@@ -50,6 +50,7 @@
* don't indicate support for them here, due to
@@ -9,8 +9,8 @@ $NetBSD: patch-mfbt_Attributes.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+# define MOZ_HAVE_CXX11_ALIGNAS
# define MOZ_HAVE_NEVER_INLINE __declspec(noinline)
# define MOZ_HAVE_NORETURN __declspec(noreturn)
- # ifdef __clang__
-@@ -70,6 +71,9 @@
+ # if _MSC_VER >= 1900
+@@ -73,6 +74,9 @@
# ifndef __has_extension
# define __has_extension __has_feature /* compatibility, for older versions of clang */
# endif
@@ -20,13 +20,11 @@ $NetBSD: patch-mfbt_Attributes.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
# if __has_extension(cxx_constexpr)
# define MOZ_HAVE_CXX11_CONSTEXPR
# endif
-@@ -84,6 +88,9 @@
- # endif
- #elif defined(__GNUC__)
+@@ -89,6 +93,7 @@
# if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
-+# if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0)
+ # define MOZ_HAVE_CXX11_CONSTEXPR
+ # if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0)
+# define MOZ_HAVE_CXX11_ALIGNAS
-+# endif
- # define MOZ_HAVE_CXX11_CONSTEXPR
- # define MOZ_HAVE_EXPLICIT_CONVERSION
- # endif
+ # define MOZ_HAVE_CXX11_CONSTEXPR_IN_TEMPLATES
+ # endif
+ # define MOZ_HAVE_EXPLICIT_CONVERSION
diff --git a/security/tor-browser/patches/patch-mfbt_Poison.cpp b/security/tor-browser/patches/patch-mfbt_Poison.cpp
index 5279deb02c7..dd8af523366 100644
--- a/security/tor-browser/patches/patch-mfbt_Poison.cpp
+++ b/security/tor-browser/patches/patch-mfbt_Poison.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-mfbt_Poison.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-mfbt_Poison.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
* Use posix_madvise(3) instead of madvise(3) for Solaris/SunOS.
Solaris/SunOS's madvise(3) is not enabled in this context,
diff --git a/security/tor-browser/patches/patch-mobile_android_installer_Makefile.in b/security/tor-browser/patches/patch-mobile_android_installer_Makefile.in
deleted file mode 100644
index a74d3b2461d..00000000000
--- a/security/tor-browser/patches/patch-mobile_android_installer_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-mobile_android_installer_Makefile.in,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- mobile/android/installer/Makefile.in.orig 2015-02-17 21:40:48.000000000 +0000
-+++ mobile/android/installer/Makefile.in
-@@ -55,6 +55,10 @@ BINPATH = bin
- endif
- DEFINES += -DBINPATH=$(BINPATH)
-
-+ifdef MOZ_DEBUG
-+DEFINES += -DMOZ_DEBUG=1
-+endif
-+
- ifdef ENABLE_MARIONETTE
- DEFINES += -DENABLE_MARIONETTE=1
- endif
diff --git a/security/tor-browser/patches/patch-mobile_android_installer_package-manifest.in b/security/tor-browser/patches/patch-mobile_android_installer_package-manifest.in
deleted file mode 100644
index acfdd9b9ac3..00000000000
--- a/security/tor-browser/patches/patch-mobile_android_installer_package-manifest.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-mobile_android_installer_package-manifest.in,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- mobile/android/installer/package-manifest.in.orig 2015-02-17 21:40:48.000000000 +0000
-+++ mobile/android/installer/package-manifest.in
-@@ -440,7 +440,7 @@
- @BINPATH@/components/dom_webspeechsynth.xpt
- #endif
-
--#ifdef MOZ_DEBUG
-+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
- @BINPATH@/components/TestInterfaceJS.js
- @BINPATH@/components/TestInterfaceJS.manifest
- #endif
diff --git a/security/tor-browser/patches/patch-modules_libjar_nsZipArchive.cpp b/security/tor-browser/patches/patch-modules_libjar_nsZipArchive.cpp
index b0861cdb141..b6f8edc6764 100644
--- a/security/tor-browser/patches/patch-modules_libjar_nsZipArchive.cpp
+++ b/security/tor-browser/patches/patch-modules_libjar_nsZipArchive.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-modules_libjar_nsZipArchive.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-modules_libjar_nsZipArchive.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- modules/libjar/nsZipArchive.cpp.orig 2013-06-18 11:01:37.000000000 +0000
+++ modules/libjar/nsZipArchive.cpp
diff --git a/security/tor-browser/patches/patch-modules_libpref_init_all.js b/security/tor-browser/patches/patch-modules_libpref_init_all.js
new file mode 100644
index 00000000000..1166b930c7f
--- /dev/null
+++ b/security/tor-browser/patches/patch-modules_libpref_init_all.js
@@ -0,0 +1,15 @@
+$NetBSD: patch-modules_libpref_init_all.js,v 1.1 2017/01/22 12:27:22 ryoon Exp $
+
+* Improve stability under NetBSD.
+
+--- modules/libpref/init/all.js.orig 2015-10-29 22:17:56.000000000 +0000
++++ modules/libpref/init/all.js
+@@ -4283,7 +4283,7 @@ pref("layers.max-active", -1);
+ pref("layers.tiles.adjust", true);
+
+ // Set the default values, and then override per-platform as needed
+-pref("layers.offmainthreadcomposition.enabled", true);
++pref("layers.offmainthreadcomposition.enabled", false);
+ // Compositor target frame rate. NOTE: If vsync is enabled the compositor
+ // frame rate will still be capped.
+ // -1 -> default (match layout.frame_rate or 60 FPS)
diff --git a/security/tor-browser/patches/patch-mozglue_build_arm.cpp b/security/tor-browser/patches/patch-mozglue_build_arm.cpp
new file mode 100644
index 00000000000..c01230bc959
--- /dev/null
+++ b/security/tor-browser/patches/patch-mozglue_build_arm.cpp
@@ -0,0 +1,57 @@
+$NetBSD: patch-mozglue_build_arm.cpp,v 1.1 2017/01/22 12:27:22 ryoon Exp $
+
+--- mozglue/build/arm.cpp.orig 2015-09-29 21:45:02.000000000 +0000
++++ mozglue/build/arm.cpp
+@@ -102,10 +102,13 @@ check_neon(void)
+ }
+ # endif // !MOZILLA_PRESUME_NEON
+
+-# elif defined(__linux__) || defined(ANDROID)
++# elif defined(__linux__) || defined(ANDROID) || defined(__NetBSD__)
+ # include <stdio.h>
+ # include <stdlib.h>
+ # include <string.h>
++# if defined(__NetBSD__)
++# include <sys/sysctl.h>
++# endif
+
+ enum{
+ MOZILLA_HAS_EDSP_FLAG=1,
+@@ -114,6 +117,29 @@ enum{
+ MOZILLA_HAS_NEON_FLAG=8
+ };
+
++# if defined(__NetBSD__)
++static unsigned
++get_arm_cpu_flags(void)
++{
++ unsigned flags = 0;
++ size_t len;
++ int flag;
++
++ len = sizeof(flag);
++ if (sysctlbyname("machdep.simdex_present", &flag, &len, NULL, 0) == 0 && flag) {
++ flags |= MOZILLA_HAS_ARMV6_FLAG;
++ flags |= MOZILLA_HAS_EDSP_FLAG;
++ }
++
++ len = sizeof(flag);
++ if (sysctlbyname("machdep.neon_present", &flag, &len, NULL, 0) == 0 && flag) {
++ flags |= MOZILLA_HAS_ARMV7_FLAG;
++ flags |= MOZILLA_HAS_NEON_FLAG;
++ }
++
++ return flags;
++}
++# else
+ static unsigned
+ get_arm_cpu_flags(void)
+ {
+@@ -178,6 +204,7 @@ get_arm_cpu_flags(void)
+ }
+ return flags;
+ }
++# endif
+
+ // Cache a local copy so we only have to read /proc/cpuinfo once.
+ static unsigned arm_cpu_flags = get_arm_cpu_flags();
diff --git a/security/tor-browser/patches/patch-mozglue_build_arm.h b/security/tor-browser/patches/patch-mozglue_build_arm.h
new file mode 100644
index 00000000000..d18572632be
--- /dev/null
+++ b/security/tor-browser/patches/patch-mozglue_build_arm.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozglue_build_arm.h,v 1.1 2017/01/22 12:27:22 ryoon Exp $
+
+--- mozglue/build/arm.h.orig 2015-09-29 21:45:02.000000000 +0000
++++ mozglue/build/arm.h
+@@ -76,7 +76,7 @@
+ # endif
+
+ // Currently we only have CPU detection for Linux via /proc/cpuinfo
+-# if defined(__linux__) || defined(ANDROID)
++# if defined(__linux__) || defined(ANDROID) || defined(__NetBSD__)
+ # define MOZILLA_ARM_HAVE_CPUID_DETECTION 1
+ # endif
+
diff --git a/security/tor-browser/patches/patch-netwerk_base_nsNetUtil.h b/security/tor-browser/patches/patch-netwerk_base_nsNetUtil.h
deleted file mode 100644
index f8eeba6e3e3..00000000000
--- a/security/tor-browser/patches/patch-netwerk_base_nsNetUtil.h
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-netwerk_base_nsNetUtil.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- netwerk/base/nsNetUtil.h.orig 2015-05-04 00:43:34.000000000 +0000
-+++ netwerk/base/nsNetUtil.h
-@@ -13,6 +13,7 @@
- #include "nsMemory.h"
- #include "nsCOMPtr.h"
- #include "prio.h" // for read/write flags, permissions, etc.
-+#include "prnetdb.h"
- #include "nsHashKeys.h"
-
- #include "plstr.h"
-@@ -2828,6 +2829,26 @@ NS_IsSrcdocChannel(nsIChannel *aChannel)
- bool NS_IsReasonableHTTPHeaderValue(const nsACString& aValue);
-
- /**
-+ * Return a host endian value decoded from network byte order,
-+ * accessed in an alignement safe way.
-+ */
-+inline uint16_t NS_decodeN16(const void *bytes)
-+{
-+ uint16_t tmp;
-+
-+ memcpy(&tmp, bytes, sizeof tmp);
-+ return PR_ntohs(tmp);
-+}
-+
-+inline uint32_t NS_decodeN32(const void *bytes)
-+{
-+ uint32_t tmp;
-+
-+ memcpy(&tmp, bytes, sizeof tmp);
-+ return PR_ntohl(tmp);
-+}
-+
-+/**
- * Return true if the given string is a valid HTTP token per RFC 2616 section
- * 2.2.
- */
diff --git a/security/tor-browser/patches/patch-netwerk_dns_moz.build b/security/tor-browser/patches/patch-netwerk_dns_moz.build
index 2a7f885c9e8..24d99daf762 100644
--- a/security/tor-browser/patches/patch-netwerk_dns_moz.build
+++ b/security/tor-browser/patches/patch-netwerk_dns_moz.build
@@ -1,8 +1,8 @@
-$NetBSD: patch-netwerk_dns_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-netwerk_dns_moz.build,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- netwerk/dns/moz.build.orig 2015-05-04 00:43:34.000000000 +0000
+--- netwerk/dns/moz.build.orig 2016-02-25 23:02:18.000000000 +0000
+++ netwerk/dns/moz.build
-@@ -68,5 +68,8 @@ LOCAL_INCLUDES += [
+@@ -66,6 +66,9 @@ LOCAL_INCLUDES += [
'/netwerk/base',
]
@@ -10,4 +10,5 @@ $NetBSD: patch-netwerk_dns_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] > '19':
- CXXFLAGS += ['-I%s/bionic/libc/dns/include' % CONFIG['ANDROID_SOURCE']]
+ LOCAL_INCLUDES += ['%' + '%s/bionic/libc/dns/include' % CONFIG['ANDROID_SOURCE']]
+
diff --git a/security/tor-browser/patches/patch-netwerk_protocol_http_Http2Session.cpp b/security/tor-browser/patches/patch-netwerk_protocol_http_Http2Session.cpp
index 9c4ecca6567..4901c47d454 100644
--- a/security/tor-browser/patches/patch-netwerk_protocol_http_Http2Session.cpp
+++ b/security/tor-browser/patches/patch-netwerk_protocol_http_Http2Session.cpp
@@ -1,94 +1,15 @@
-$NetBSD: patch-netwerk_protocol_http_Http2Session.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-netwerk_protocol_http_Http2Session.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
-https://bugzilla.mozilla.org/show_bug.cgi?id=1130822
-Fix obivous alignment issues (causing crashes on some architectures).
-
---- netwerk/protocol/http/Http2Session.cpp.orig 2015-02-17 21:40:50.000000000 +0000
+--- netwerk/protocol/http/Http2Session.cpp.orig 2016-07-25 12:12:07.000000000 +0000
+++ netwerk/protocol/http/Http2Session.cpp
-@@ -32,7 +32,6 @@
- #include "nsStandardURL.h"
- #include "nsURLHelper.h"
- #include "prprf.h"
--#include "prnetdb.h"
- #include "sslt.h"
-
- #ifdef DEBUG
-@@ -1295,7 +1294,7 @@ Http2Session::RecvPriority(Http2Session
- return rv;
-
- uint32_t newPriorityDependency =
-- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes));
-+ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes);
- bool exclusive = !!(newPriorityDependency & 0x80000000);
- newPriorityDependency &= 0x7fffffff;
- uint8_t newPriorityWeight = *(self->mInputFrameBuffer.get() + kFrameHeaderBytes + 4);
-@@ -1326,7 +1325,7 @@ Http2Session::RecvRstStream(Http2Session
- }
-
- self->mDownstreamRstReason =
-- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes));
-+ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes);
-
- LOG3(("Http2Session::RecvRstStream %p RST_STREAM Reason Code %u ID %x\n",
- self, self->mDownstreamRstReason, self->mInputFrameID));
-@@ -1387,8 +1386,8 @@ Http2Session::RecvSettings(Http2Session
- uint8_t *setting = reinterpret_cast<uint8_t *>
- (self->mInputFrameBuffer.get()) + kFrameHeaderBytes + index * 6;
-
-- uint16_t id = PR_ntohs(*reinterpret_cast<uint16_t *>(setting));
-- uint32_t value = PR_ntohl(*reinterpret_cast<uint32_t *>(setting + 2));
-+ uint16_t id = NS_decodeN16(setting);
-+ uint32_t value = NS_decodeN32(setting + 2);
- LOG3(("Settings ID %u, Value %u", id, value));
-
- switch (id)
-@@ -1473,7 +1472,7 @@ Http2Session::RecvPushPromise(Http2Sessi
- }
- promiseLen = 4;
- promisedID =
-- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes + paddingControlBytes));
-+ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes + paddingControlBytes);
- promisedID &= 0x7fffffff;
- }
-
-@@ -1733,11 +1732,11 @@ Http2Session::RecvGoAway(Http2Session *s
-
- self->mShouldGoAway = true;
- self->mGoAwayID =
-- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes));
-+ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes);
- self->mGoAwayID &= 0x7fffffff;
- self->mCleanShutdown = true;
- uint32_t statusCode =
-- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes + 4));
-+ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes + 4);
-
- // Find streams greater than the last-good ID and mark them for deletion
- // in the mGoAwayStreamsToRestart queue with the GoAwayEnumerator. The
-@@ -1809,7 +1808,7 @@ Http2Session::RecvWindowUpdate(Http2Sess
+@@ -3521,8 +3521,8 @@ Http2Session::ConfirmTLSProfile()
+ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n",
+ this, keybits));
+ RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
+- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128
+- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n",
++ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1.
++ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n",
+ this, keybits));
+ RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
}
-
- uint32_t delta =
-- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes));
-+ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes);
- delta &= 0x7fffffff;
-
- LOG3(("Http2Session::RecvWindowUpdate %p len=%d Stream 0x%X.\n",
-@@ -2453,7 +2452,7 @@ Http2Session::WriteSegments(nsAHttpSegme
-
- // 3 bytes of length, 1 type byte, 1 flag byte, 1 unused bit, 31 bits of ID
- uint8_t totallyWastedByte = mInputFrameBuffer.get()[0];
-- mInputFrameDataSize = PR_ntohs(*reinterpret_cast<uint16_t *>(mInputFrameBuffer.get() + 1));
-+ mInputFrameDataSize = NS_decodeN16(mInputFrameBuffer.get() + 1);
- if (totallyWastedByte || (mInputFrameDataSize > kMaxFrameData)) {
- LOG3(("Got frame too large 0x%02X%04X", totallyWastedByte, mInputFrameDataSize));
- RETURN_SESSION_ERROR(this, PROTOCOL_ERROR);
-@@ -2461,7 +2460,7 @@ Http2Session::WriteSegments(nsAHttpSegme
- mInputFrameType = *reinterpret_cast<uint8_t *>(mInputFrameBuffer.get() + kFrameLengthBytes);
- mInputFrameFlags = *reinterpret_cast<uint8_t *>(mInputFrameBuffer.get() + kFrameLengthBytes + kFrameTypeBytes);
- mInputFrameID =
-- PR_ntohl(*reinterpret_cast<uint32_t *>(mInputFrameBuffer.get() + kFrameLengthBytes + kFrameTypeBytes + kFrameFlagBytes));
-+ NS_decodeN32(mInputFrameBuffer.get() + kFrameLengthBytes + kFrameTypeBytes + kFrameFlagBytes);
- mInputFrameID &= 0x7fffffff;
- mInputFrameDataRead = 0;
-
diff --git a/security/tor-browser/patches/patch-pb b/security/tor-browser/patches/patch-pb
index c25f5f739f6..a794ec09fd0 100644
--- a/security/tor-browser/patches/patch-pb
+++ b/security/tor-browser/patches/patch-pb
@@ -1,4 +1,4 @@
-$NetBSD: patch-pb,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-pb,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- xulrunner/installer/libxul.pc.in.orig 2013-07-30 00:59:18.000000000 +0000
+++ xulrunner/installer/libxul.pc.in
diff --git a/security/tor-browser/patches/patch-pc b/security/tor-browser/patches/patch-pc
index 926b7b42b61..b8c03ae146e 100644
--- a/security/tor-browser/patches/patch-pc
+++ b/security/tor-browser/patches/patch-pc
@@ -1,4 +1,4 @@
-$NetBSD: patch-pc,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-pc,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- xulrunner/installer/libxul-embedding.pc.in.orig 2013-07-30 00:59:18.000000000 +0000
+++ xulrunner/installer/libxul-embedding.pc.in
diff --git a/security/tor-browser/patches/patch-rc b/security/tor-browser/patches/patch-rc
index 1e0c66826a1..2d9a87036b3 100644
--- a/security/tor-browser/patches/patch-rc
+++ b/security/tor-browser/patches/patch-rc
@@ -1,16 +1,16 @@
-$NetBSD: patch-rc,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-rc,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- browser/branding/unofficial/locales/en-US/brand.dtd.orig 2015-05-04 00:43:19.000000000 +0000
+--- browser/branding/unofficial/locales/en-US/brand.dtd.orig 2015-08-24 21:53:06.000000000 +0000
+++ browser/branding/unofficial/locales/en-US/brand.dtd
@@ -2,8 +2,8 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
--<!ENTITY brandShorterName "Mozilla Developer Preview">
--<!ENTITY brandShortName "Mozilla Developer Preview">
--<!ENTITY brandFullName "Mozilla Developer Preview">
+-<!ENTITY brandShorterName "Nightly">
+-<!ENTITY brandShortName "Nightly">
+-<!ENTITY brandFullName "Nightly">
+<!ENTITY brandShorterName "Browser">
+<!ENTITY brandShortName "Browser">
+<!ENTITY brandFullName "Browser">
- <!ENTITY vendorShortName "mozilla.org">
+ <!ENTITY vendorShortName "Mozilla">
<!ENTITY trademarkInfo.part1 " ">
diff --git a/security/tor-browser/patches/patch-security_certverifier_OCSPRequestor.cpp b/security/tor-browser/patches/patch-security_certverifier_OCSPRequestor.cpp
deleted file mode 100644
index 8307f9e97af..00000000000
--- a/security/tor-browser/patches/patch-security_certverifier_OCSPRequestor.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-security_certverifier_OCSPRequestor.cpp,v 1.1 2016/04/04 17:36:34 joerg Exp $
-
---- security/certverifier/OCSPRequestor.cpp.orig 2016-04-04 15:32:34.076128034 +0000
-+++ security/certverifier/OCSPRequestor.cpp
-@@ -174,7 +174,6 @@ DoOCSPRequest(PLArenaPool* arena, const
- SEC_HTTP_REQUEST_SESSION requestSessionPtr;
- if (nsNSSHttpInterface::createFcn(serverSession.get(), "http",
- path.get(), method.get(),
-- isolationKey,
- timeout, &requestSessionPtr)
- != SECSuccess) {
- PR_SetError(SEC_ERROR_NO_MEMORY, 0);
diff --git a/security/tor-browser/patches/patch-security_manager_ssl_src_nsNSSCallbacks.cpp b/security/tor-browser/patches/patch-security_manager_ssl_src_nsNSSCallbacks.cpp
deleted file mode 100644
index f396799f8da..00000000000
--- a/security/tor-browser/patches/patch-security_manager_ssl_src_nsNSSCallbacks.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-security_manager_ssl_src_nsNSSCallbacks.cpp,v 1.1 2016/04/04 17:36:35 joerg Exp $
-
---- security/manager/ssl/src/nsNSSCallbacks.cpp.orig 2016-04-04 15:21:08.677783866 +0000
-+++ security/manager/ssl/src/nsNSSCallbacks.cpp
-@@ -106,18 +106,6 @@ nsHTTPDownloadEvent::Run()
-
- chan->SetLoadFlags(nsIRequest::LOAD_ANONYMOUS);
-
-- // If we have an isolation key, use it as the URI for this channel.
-- if (!mRequestSession->mIsolationKey.IsEmpty()) {
-- nsCOMPtr<nsIHttpChannelInternal> channelInternal(do_QueryInterface(chan));
-- if (channelInternal) {
-- nsCString documentURISpec("https://");
-- documentURISpec.Append(mRequestSession->mIsolationKey);
-- nsCOMPtr<nsIURI> documentURI;
-- /* nsresult rv = */ NS_NewURI(getter_AddRefs(documentURI), documentURISpec);
-- channelInternal->SetDocumentURI(documentURI);
-- }
-- }
--
- // Create a loadgroup for this new channel. This way if the channel
- // is redirected, we'll have a way to cancel the resulting channel.
- nsCOMPtr<nsILoadGroup> lg = do_CreateInstance(NS_LOADGROUP_CONTRACTID);
-@@ -218,7 +206,6 @@ SECStatus nsNSSHttpRequestSession::creat
- const char *http_protocol_variant,
- const char *path_and_query_string,
- const char *http_request_method,
-- const char *isolationKey,
- const PRIntervalTime timeout,
- SEC_HTTP_REQUEST_SESSION *pRequest)
- {
-@@ -250,8 +237,6 @@ SECStatus nsNSSHttpRequestSession::creat
- rs->mURL.AppendInt(hss->mPort);
- rs->mURL.Append(path_and_query_string);
-
-- rs->mIsolationKey.Assign(isolationKey);
--
- rs->mRequestMethod = http_request_method;
-
- *pRequest = (void*)rs;
diff --git a/security/tor-browser/patches/patch-security_manager_ssl_src_nsNSSCallbacks.h b/security/tor-browser/patches/patch-security_manager_ssl_src_nsNSSCallbacks.h
deleted file mode 100644
index 92a38410adb..00000000000
--- a/security/tor-browser/patches/patch-security_manager_ssl_src_nsNSSCallbacks.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-security_manager_ssl_src_nsNSSCallbacks.h,v 1.1 2016/04/04 17:36:35 joerg Exp $
-
---- security/manager/ssl/src/nsNSSCallbacks.h.orig 2016-04-04 15:21:30.039415148 +0000
-+++ security/manager/ssl/src/nsNSSCallbacks.h
-@@ -93,7 +93,6 @@ public:
- const char *http_protocol_variant,
- const char *path_and_query_string,
- const char *http_request_method,
-- const char *isolation_key,
- const PRIntervalTime timeout,
- SEC_HTTP_REQUEST_SESSION *pRequest);
-
-@@ -171,13 +170,11 @@ public:
- const char *http_protocol_variant,
- const char *path_and_query_string,
- const char *http_request_method,
-- const char *isolation_key,
- const PRIntervalTime timeout,
- SEC_HTTP_REQUEST_SESSION *pRequest)
- {
- return nsNSSHttpRequestSession::createFcn(session, http_protocol_variant,
- path_and_query_string, http_request_method,
-- isolation_key,
- timeout, pRequest);
- }
-
diff --git a/security/tor-browser/patches/patch-security_manager_ssl_src_nsNSSComponent.cpp b/security/tor-browser/patches/patch-security_manager_ssl_src_nsNSSComponent.cpp
deleted file mode 100644
index 79791b72a0f..00000000000
--- a/security/tor-browser/patches/patch-security_manager_ssl_src_nsNSSComponent.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-security_manager_ssl_src_nsNSSComponent.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- security/manager/ssl/src/nsNSSComponent.cpp.orig 2014-10-11 09:06:44.000000000 +0000
-+++ security/manager/ssl/src/nsNSSComponent.cpp
-@@ -53,6 +53,7 @@
- #include "nss.h"
- #include "pkix/pkixnss.h"
- #include "ssl.h"
-+#define NSS_ENABLE_ECC 1
- #include "sslproto.h"
- #include "secmod.h"
- #include "secerr.h"
diff --git a/security/tor-browser/patches/patch-bg b/security/tor-browser/patches/patch-storage_SQLiteMutex.h
index 174dec35ec4..7e525650878 100644
--- a/security/tor-browser/patches/patch-bg
+++ b/security/tor-browser/patches/patch-storage_SQLiteMutex.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-bg,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-storage_SQLiteMutex.h,v 1.1 2017/01/22 12:27:22 ryoon Exp $
---- storage/src/SQLiteMutex.h.orig 2013-10-25 22:27:40.000000000 +0000
-+++ storage/src/SQLiteMutex.h
-@@ -108,15 +108,19 @@ public:
+--- storage/SQLiteMutex.h.orig 2015-08-24 21:53:07.000000000 +0000
++++ storage/SQLiteMutex.h
+@@ -107,15 +107,19 @@ public:
void assertCurrentThreadOwns()
{
NS_ASSERTION(mMutex, "No mutex associated with this wrapper!");
diff --git a/security/tor-browser/patches/patch-toolkit_components_osfile_modules_osfile__unix__back.jsm b/security/tor-browser/patches/patch-toolkit_components_osfile_modules_osfile__unix__back.jsm
deleted file mode 100644
index 9a47a263299..00000000000
--- a/security/tor-browser/patches/patch-toolkit_components_osfile_modules_osfile__unix__back.jsm
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-toolkit_components_osfile_modules_osfile__unix__back.jsm,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
-Based on martin@'s patch for firefox 27.0
-
-* Use off_t for st_size
-* Use function name for NetBSD
-
---- toolkit/components/osfile/modules/osfile_unix_back.jsm.orig 2014-05-29 23:31:41.000000000 +0000
-+++ toolkit/components/osfile/modules/osfile_unix_back.jsm
-@@ -228,8 +228,8 @@
- let statvfs = new SharedAll.HollowStructure("statvfs",
- Const.OSFILE_SIZEOF_STATVFS);
-
-- statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BSIZE,
-- "f_bsize", Type.unsigned_long.implementation);
-+ statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_FRSIZE,
-+ "f_frsize", Type.unsigned_long.implementation);
- statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BAVAIL,
- "f_bavail", Type.fsblkcnt_t.implementation);
-
-@@ -626,21 +626,22 @@
- return Stat.fxstat(ver, fd, buf);
- };
- } else if (OS.Constants.Sys.Name == "NetBSD") {
-- // NetBSD 5.0 and newer
-- libc.declareLazyFFI(SysFile, "stat",
-- "__stat50", ctypes.default_abi,
-+ // NetBSD 5.0 uses *30, and netbsd-6 uses *50
-+ let v = OS.Constants.libc.OSFILE_SIZEOF_TIME_T < 8 ? "30" : "50";
-+ libc.declareLazyFFI(SysFile, "stat",
-+ "__stat"+v, ctypes.default_abi,
- /*return*/ Type.negativeone_or_nothing,
- /*path*/ Type.path,
- /*buf*/ Type.stat.out_ptr
- );
- libc.declareLazyFFI(SysFile, "lstat",
-- "__lstat50", ctypes.default_abi,
-+ "__lstat"+v, ctypes.default_abi,
- /*return*/ Type.negativeone_or_nothing,
- /*path*/ Type.path,
- /*buf*/ Type.stat.out_ptr
- );
-- libc.declareLazyFFI(SysFile, "fstat",
-- "__fstat50", ctypes.default_abi,
-+ libc.declareLazyFFI(SysFile, "fstat", libc,
-+ "__fstat"+v, ctypes.default_abi,
- /*return*/ Type.negativeone_or_nothing,
- /*fd*/ Type.fd,
- /*buf*/ Type.stat.out_ptr
diff --git a/security/tor-browser/patches/patch-toolkit_components_osfile_modules_osfile__unix__front.jsm b/security/tor-browser/patches/patch-toolkit_components_osfile_modules_osfile__unix__front.jsm
deleted file mode 100644
index aa5eba22011..00000000000
--- a/security/tor-browser/patches/patch-toolkit_components_osfile_modules_osfile__unix__front.jsm
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-toolkit_components_osfile_modules_osfile__unix__front.jsm,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- toolkit/components/osfile/modules/osfile_unix_front.jsm.orig 2014-09-24 01:05:38.000000000 +0000
-+++ toolkit/components/osfile/modules/osfile_unix_front.jsm
-@@ -399,7 +399,7 @@
- throw_on_negative("statvfs", (UnixFile.statvfs || UnixFile.statfs)(sourcePath, fileSystemInfoPtr));
-
- let bytes = new Type.uint64_t.implementation(
-- fileSystemInfo.f_bsize * fileSystemInfo.f_bavail);
-+ fileSystemInfo.f_frsize * fileSystemInfo.f_bavail);
-
- return bytes.value;
- };
diff --git a/security/tor-browser/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h b/security/tor-browser/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h
new file mode 100644
index 00000000000..cf6aa8734c7
--- /dev/null
+++ b/security/tor-browser/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h,v 1.1 2017/01/22 12:27:22 ryoon Exp $
+
+--- toolkit/components/protobuf/src/google/protobuf/stubs/atomicops.h.orig 2015-09-29 21:45:03.000000000 +0000
++++ toolkit/components/protobuf/src/google/protobuf/stubs/atomicops.h
+@@ -76,9 +76,15 @@ typedef intptr_t Atomic64;
+ #endif
+ #endif
+
++#if defined(__NetBSD__) && defined(__arm__)
++// NetBSD/arm uses long for intptr_t, which fails -fpermissive checks. So
++// explicitly use int32 here instead.
++typedef int32 AtomicWord;
++#else
+ // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or
+ // Atomic64 routines below, depending on your architecture.
+ typedef intptr_t AtomicWord;
++#endif
+
+ // Atomically execute:
+ // result = *ptr;
diff --git a/security/tor-browser/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h b/security/tor-browser/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h
new file mode 100644
index 00000000000..44c8812e018
--- /dev/null
+++ b/security/tor-browser/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h,v 1.1 2017/01/22 12:27:22 ryoon Exp $
+
+--- toolkit/components/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2015-09-11 00:23:02.000000000 +0000
++++ toolkit/components/protobuf/src/google/protobuf/stubs/platform_macros.h
+@@ -67,7 +67,7 @@
+ #define GOOGLE_PROTOBUF_ARCH_32_BIT 1
+ #elif defined(sparc)
+ #define GOOGLE_PROTOBUF_ARCH_SPARC 1
+-#ifdef SOLARIS_64BIT_ENABLED
++#if (defined(sun) && defined(SOLARIS_64BIT_ENABLED)) || __LP64__
+ #define GOOGLE_PROTOBUF_ARCH_64_BIT 1
+ #else
+ #define GOOGLE_PROTOBUF_ARCH_32_BIT 1
diff --git a/security/tor-browser/patches/patch-toolkit_library_moz.build b/security/tor-browser/patches/patch-toolkit_library_moz.build
index acf3b7818f6..d6c548746a3 100644
--- a/security/tor-browser/patches/patch-toolkit_library_moz.build
+++ b/security/tor-browser/patches/patch-toolkit_library_moz.build
@@ -1,4 +1,4 @@
-$NetBSD: patch-toolkit_library_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-toolkit_library_moz.build,v 1.2 2017/01/22 12:27:22 ryoon Exp $
MOZ_GSTREAMER:
GSTREAMER_LIBS are linked to libxul on Darwin, while they are
diff --git a/security/tor-browser/patches/patch-toolkit_xre_glxtest.cpp b/security/tor-browser/patches/patch-toolkit_xre_glxtest.cpp
new file mode 100644
index 00000000000..14d73699b19
--- /dev/null
+++ b/security/tor-browser/patches/patch-toolkit_xre_glxtest.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-toolkit_xre_glxtest.cpp,v 1.1 2017/01/22 12:27:22 ryoon Exp $
+
+Fix libGL filename on NetBSD,
+see https://bugzilla.mozilla.org/show_bug.cgi?id=1180498
+
+--- toolkit/xre/glxtest.cpp.orig 2015-07-04 20:26:15.000000000 +0200
++++ toolkit/xre/glxtest.cpp 2015-07-04 20:26:15.000000000 +0200
+@@ -124,7 +124,7 @@ void glxtest()
+ fatal_error("The MOZ_AVOID_OPENGL_ALTOGETHER environment variable is defined");
+
+ ///// Open libGL and load needed symbols /////
+-#ifdef __OpenBSD__
++#if defined(__OpenBSD__) || defined(__NetBSD__)
+ #define LIBGL_FILENAME "libGL.so"
+ #else
+ #define LIBGL_FILENAME "libGL.so.1"
diff --git a/security/tor-browser/patches/patch-toolkit_xre_nsAppRunner.cpp b/security/tor-browser/patches/patch-toolkit_xre_nsAppRunner.cpp
index 8095078e7b6..0bd355ebdad 100644
--- a/security/tor-browser/patches/patch-toolkit_xre_nsAppRunner.cpp
+++ b/security/tor-browser/patches/patch-toolkit_xre_nsAppRunner.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-toolkit_xre_nsAppRunner.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-toolkit_xre_nsAppRunner.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
MacOS X < 10.6 had an undocumented behavior concerning execve(2)
inside a threaded process. If a process tried to call execve(2) and
diff --git a/security/tor-browser/patches/patch-toolkit_xre_nsEmbedFunctions.cpp b/security/tor-browser/patches/patch-toolkit_xre_nsEmbedFunctions.cpp
index a446a1c8bef..5aa904f3913 100644
--- a/security/tor-browser/patches/patch-toolkit_xre_nsEmbedFunctions.cpp
+++ b/security/tor-browser/patches/patch-toolkit_xre_nsEmbedFunctions.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-toolkit_xre_nsEmbedFunctions.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-toolkit_xre_nsEmbedFunctions.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- toolkit/xre/nsEmbedFunctions.cpp.orig 2013-05-11 19:19:55.000000000 +0000
+++ toolkit/xre/nsEmbedFunctions.cpp
diff --git a/security/tor-browser/patches/patch-toolkit_xre_nsXREDirProvider.cpp b/security/tor-browser/patches/patch-toolkit_xre_nsXREDirProvider.cpp
deleted file mode 100644
index f719c689020..00000000000
--- a/security/tor-browser/patches/patch-toolkit_xre_nsXREDirProvider.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-$NetBSD: patch-toolkit_xre_nsXREDirProvider.cpp,v 1.2 2016/03/20 06:53:37 ryoon Exp $
-
-https://github.com/torbsd/openbsd-ports/blob/beeb760037237c6e1864942356b8135e9c430d78/www/tbb/tor-browser/patches/patch-toolkit_xre_nsXREDirProvider_cpp
-
---- toolkit/xre/nsXREDirProvider.cpp.orig 2016-03-19 23:19:47.000000000 +0000
-+++ toolkit/xre/nsXREDirProvider.cpp
-@@ -1222,15 +1222,22 @@ nsXREDirProvider::GetUserDataDirectoryHo
- NS_ENSURE_ARG_POINTER(aFile);
- nsCOMPtr<nsIFile> localDir;
-
-+#if 0
- nsresult rv = GetAppRootDir(getter_AddRefs(localDir));
- NS_ENSURE_SUCCESS(rv, rv);
- rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorBrowser"
- XPCOM_FILE_PATH_SEPARATOR "Data"
- XPCOM_FILE_PATH_SEPARATOR "Browser"));
- NS_ENSURE_SUCCESS(rv, rv);
-+#else
-+ nsresult rv =
-+ NS_NewNativeLocalFile(nsDependentCString(PR_GetEnv("HOME")), true,
-+ getter_AddRefs(localDir));
-+ NS_ENSURE_SUCCESS(rv, rv);
-+#endif
-
- if (aLocal) {
-- rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches"));
-+ rv = localDir->AppendNative(NS_LITERAL_CSTRING(".tor-browser-caches"));
- NS_ENSURE_SUCCESS(rv, rv);
- }
-
-@@ -1338,6 +1345,7 @@ nsXREDirProvider::GetAppRootDir(nsIFile*
- nsresult rv = GetAppDir()->Clone(getter_AddRefs(appRootDir));
- NS_ENSURE_SUCCESS(rv, rv);
-
-+#if 0
- int levelsToRemove = 1; // In FF21+, appDir points to browser subdirectory.
- #if defined(XP_MACOSX)
- levelsToRemove += 2;
-@@ -1358,6 +1366,7 @@ nsXREDirProvider::GetAppRootDir(nsIFile*
- if (didRemove)
- --levelsToRemove;
- }
-+#endif
-
- if (!appRootDir)
- return NS_ERROR_FAILURE;
-@@ -1454,7 +1463,7 @@ nsXREDirProvider::AppendSysUserExtension
-
- #elif defined(XP_UNIX)
-
-- static const char* const sXR = ".mozilla";
-+ static const char* const sXR = ".tor-browser";
- rv = aFile->AppendNative(nsDependentCString(sXR));
- NS_ENSURE_SUCCESS(rv, rv);
-
-@@ -1513,6 +1522,9 @@ nsXREDirProvider::AppendProfilePath(nsIF
- rv = aFile->AppendNative(nsDependentCString("mozilla"));
- NS_ENSURE_SUCCESS(rv, rv);
- #elif defined(XP_UNIX)
-+ nsAutoCString folder;
-+ if (!aLocal)
-+ folder.Assign('.');
- if (!profile.IsEmpty()) {
- // Skip any leading path characters
- const char* profileStart = profile.get();
-@@ -1521,17 +1533,23 @@ nsXREDirProvider::AppendProfilePath(nsIF
-
- // On the off chance that someone wanted their folder to be hidden don't
- // let it become ".."
-- if (*profileStart == '.')
-+ if (*profileStart == '.' && !aLocal)
- profileStart++;
-
-+#if 0
- // Make it hidden (by starting with ".").
- nsAutoCString folder(".");
-+#endif
- folder.Append(profileStart);
- ToLowerCase(folder);
-
- rv = AppendProfileString(aFile, folder.BeginReading());
-- NS_ENSURE_SUCCESS(rv, rv);
-+ } else {
-+ folder.Append("tor-browser");
-+ ToLowerCase(folder);
-+ rv = aFile->AppendNative(folder);
- }
-+ NS_ENSURE_SUCCESS(rv, rv);
-
- #else
- #error "Don't know how to get profile path on your platform"
diff --git a/security/tor-browser/patches/patch-webapprt_moz.build b/security/tor-browser/patches/patch-webapprt_moz.build
index 86eb9cb0872..ca077380514 100644
--- a/security/tor-browser/patches/patch-webapprt_moz.build
+++ b/security/tor-browser/patches/patch-webapprt_moz.build
@@ -1,4 +1,4 @@
-$NetBSD: patch-webapprt_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-webapprt_moz.build,v 1.2 2017/01/22 12:27:22 ryoon Exp $
Don't assume cocoa toolkit just because OS_ARCH is Darwin.
diff --git a/security/tor-browser/patches/patch-widget_gtk_gtk2drawing.c b/security/tor-browser/patches/patch-widget_gtk_gtk2drawing.c
deleted file mode 100644
index 8ef069efada..00000000000
--- a/security/tor-browser/patches/patch-widget_gtk_gtk2drawing.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-widget_gtk_gtk2drawing.c,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- widget/gtk/gtk2drawing.c.orig 2015-03-27 02:20:33.000000000 +0000
-+++ widget/gtk/gtk2drawing.c
-@@ -831,7 +831,7 @@ moz_gtk_get_focus_outline_size(gint* foc
- return MOZ_GTK_SUCCESS;
- }
-
--gint
-+static gint
- moz_gtk_widget_get_focus(GtkWidget* widget, gboolean* interior_focus,
- gint* focus_width, gint* focus_pad)
- {
-@@ -928,7 +928,7 @@ moz_gtk_splitter_get_metrics(gint orient
- return MOZ_GTK_SUCCESS;
- }
-
--gint
-+static gint
- moz_gtk_button_get_inner_border(GtkWidget* widget, GtkBorder* inner_border)
- {
- static const GtkBorder default_inner_border = { 1, 1, 1, 1 };
diff --git a/security/tor-browser/patches/patch-widget_gtk_gtk3drawing.c b/security/tor-browser/patches/patch-widget_gtk_gtk3drawing.c
deleted file mode 100644
index 57bd75383c7..00000000000
--- a/security/tor-browser/patches/patch-widget_gtk_gtk3drawing.c
+++ /dev/null
@@ -1,833 +0,0 @@
-$NetBSD: patch-widget_gtk_gtk3drawing.c,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- widget/gtk/gtk3drawing.c.orig 2015-05-04 00:43:35.000000000 +0000
-+++ widget/gtk/gtk3drawing.c
-@@ -65,6 +65,7 @@ static GtkWidget* gScrolledWindowWidget;
- static style_prop_t style_prop_func;
- static gboolean have_arrow_scaling;
- static gboolean checkbox_check_state;
-+static gboolean notebook_has_tab_gap;
- static gboolean is_initialized;
-
- #define ARROW_UP 0
-@@ -725,6 +726,14 @@ moz_gtk_init()
- else
- checkbox_check_state = GTK_STATE_FLAG_ACTIVE;
-
-+ if(!gtk_check_version(3, 12, 0)) {
-+ ensure_tab_widget();
-+ gtk_widget_style_get(gTabWidget, "has-tab-gap", &notebook_has_tab_gap, NULL);
-+ }
-+ else {
-+ notebook_has_tab_gap = TRUE;
-+ }
-+
- /* Add style property to GtkEntry.
- * Adding the style property to the normal GtkEntry class means that it
- * will work without issues inside GtkComboBox and for Spinbuttons. */
-@@ -762,37 +771,17 @@ moz_gtk_radio_get_metrics(gint* indicato
- gint
- moz_gtk_get_focus_outline_size(gint* focus_h_width, gint* focus_v_width)
- {
-- gboolean interior_focus;
-- gint focus_width = 0;
-+ GtkBorder border;
-+ GtkBorder padding;
-+ GtkStyleContext *style;
-
- ensure_entry_widget();
-- gtk_widget_style_get(gEntryWidget,
-- "interior-focus", &interior_focus,
-- "focus-line-width", &focus_width,
-- NULL);
-- if (interior_focus) {
-- GtkBorder border;
-- GtkStyleContext *style = gtk_widget_get_style_context(gEntryWidget);
-- gtk_style_context_get_border(style, 0, &border);
-- *focus_h_width = border.left + focus_width;
-- *focus_v_width = border.top + focus_width;
-- } else {
-- *focus_h_width = focus_width;
-- *focus_v_width = focus_width;
-- }
-- return MOZ_GTK_SUCCESS;
--}
--
--gint
--moz_gtk_widget_get_focus(GtkWidget* widget, gboolean* interior_focus,
-- gint* focus_width, gint* focus_pad)
--{
-- gtk_widget_style_get (widget,
-- "interior-focus", interior_focus,
-- "focus-line-width", focus_width,
-- "focus-padding", focus_pad,
-- NULL);
-+ style = gtk_widget_get_style_context(gEntryWidget);
-
-+ gtk_style_context_get_border(style, 0, &border);
-+ gtk_style_context_get_padding(style, 0, &padding);
-+ *focus_h_width = border.left + padding.left;
-+ *focus_v_width = border.top + padding.top;
- return MOZ_GTK_SUCCESS;
- }
-
-@@ -880,24 +869,6 @@ moz_gtk_splitter_get_metrics(gint orient
- return MOZ_GTK_SUCCESS;
- }
-
--gint
--moz_gtk_button_get_inner_border(GtkWidget* widget, GtkBorder* inner_border)
--{
-- static const GtkBorder default_inner_border = { 1, 1, 1, 1 };
-- GtkBorder *tmp_border;
--
-- gtk_widget_style_get (widget, "inner-border", &tmp_border, NULL);
--
-- if (tmp_border) {
-- *inner_border = *tmp_border;
-- gtk_border_free(tmp_border);
-- }
-- else
-- *inner_border = default_inner_border;
--
-- return MOZ_GTK_SUCCESS;
--}
--
- static gint
- moz_gtk_button_paint(cairo_t *cr, GdkRectangle* rect,
- GtkWidgetState* state,
-@@ -908,19 +879,8 @@ moz_gtk_button_paint(cairo_t *cr, GdkRec
- GtkStyleContext* style = gtk_widget_get_style_context(widget);
- gint x = rect->x, y=rect->y, width=rect->width, height=rect->height;
-
-- gboolean interior_focus;
-- gint focus_width, focus_pad;
--
-- moz_gtk_widget_get_focus(widget, &interior_focus, &focus_width, &focus_pad);
- gtk_widget_set_direction(widget, direction);
--
-- if (!interior_focus && state->focused) {
-- x += focus_width + focus_pad;
-- y += focus_width + focus_pad;
-- width -= 2 * (focus_width + focus_pad);
-- height -= 2 * (focus_width + focus_pad);
-- }
--
-+
- gtk_style_context_save(style);
- gtk_style_context_set_state(style, state_flags);
-
-@@ -953,20 +913,12 @@ moz_gtk_button_paint(cairo_t *cr, GdkRec
- }
-
- if (state->focused) {
-- if (interior_focus) {
-- GtkBorder border;
-- gtk_style_context_get_border(style, state_flags, &border);
-- x += border.left + focus_pad;
-- y += border.top + focus_pad;
-- width -= 2 * (border.left + focus_pad);
-- height -= 2 * (border.top + focus_pad);
-- } else {
-- x -= focus_width + focus_pad;
-- y -= focus_width + focus_pad;
-- width += 2 * (focus_width + focus_pad);
-- height += 2 * (focus_width + focus_pad);
-- }
--
-+ GtkBorder border;
-+ gtk_style_context_get_border(style, state_flags, &border);
-+ x += border.left;
-+ y += border.top;
-+ width -= (border.left + border.right);
-+ height -= (border.top + border.bottom);
- gtk_render_focus(style, cr, x, y, width, height);
- }
- gtk_style_context_restore(style);
-@@ -1056,33 +1008,23 @@ calculate_button_inner_rect(GtkWidget* b
- GtkTextDirection direction,
- gboolean ignore_focus)
- {
-- GtkBorder inner_border;
-- gboolean interior_focus;
-- gint focus_width, focus_pad;
- GtkStyleContext* style;
- GtkBorder border;
-+ GtkBorder padding = {0, 0, 0, 0};
-
- style = gtk_widget_get_style_context(button);
-
- /* This mirrors gtkbutton's child positioning */
-- moz_gtk_button_get_inner_border(button, &inner_border);
-- moz_gtk_widget_get_focus(button, &interior_focus,
-- &focus_width, &focus_pad);
--
-- if (ignore_focus)
-- focus_width = focus_pad = 0;
--
- gtk_style_context_get_border(style, 0, &border);
-+ if (!ignore_focus)
-+ gtk_style_context_get_padding(style, 0, &padding);
-
-- inner_rect->x = rect->x + border.left + focus_width + focus_pad;
-- inner_rect->x += direction == GTK_TEXT_DIR_LTR ?
-- inner_border.left : inner_border.right;
-- inner_rect->y = rect->y + inner_border.top + border.top +
-- focus_width + focus_pad;
-- inner_rect->width = MAX(1, rect->width - inner_border.left -
-- inner_border.right - (border.left + focus_pad + focus_width) * 2);
-- inner_rect->height = MAX(1, rect->height - inner_border.top -
-- inner_border.bottom - (border.top + focus_pad + focus_width) * 2);
-+ inner_rect->x = rect->x + border.left + padding.left;
-+ inner_rect->y = rect->y + padding.top + border.top;
-+ inner_rect->width = MAX(1, rect->width - padding.left -
-+ padding.right - border.left * 2);
-+ inner_rect->height = MAX(1, rect->height - padding.top -
-+ padding.bottom - border.top * 2);
-
- return MOZ_GTK_SUCCESS;
- }
-@@ -1230,6 +1172,7 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi
- GtkStyleContext* style;
- GtkScrollbar *scrollbar;
- GtkAdjustment *adj;
-+ GtkBorder margin;
-
- ensure_scrollbar_widget();
-
-@@ -1239,15 +1182,20 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi
- scrollbar = GTK_SCROLLBAR(gVertScrollbarWidget);
-
- gtk_widget_set_direction(GTK_WIDGET(scrollbar), direction);
--
-+
- style = gtk_widget_get_style_context(GTK_WIDGET(scrollbar));
- gtk_style_context_save(style);
--
-+
- gtk_style_context_add_class(style, GTK_STYLE_CLASS_SLIDER);
- gtk_style_context_set_state(style, state_flags);
-
-- gtk_render_slider(style, cr, rect->x, rect->y,
-- rect->width, rect->height,
-+ gtk_style_context_get_margin (style, state_flags, &margin);
-+
-+ gtk_render_slider(style, cr,
-+ rect->x + margin.left,
-+ rect->y + margin.top,
-+ rect->width - margin.left - margin.right,
-+ rect->height - margin.top - margin.bottom,
- (widget == MOZ_GTK_SCROLLBAR_THUMB_HORIZONTAL) ?
- GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
-
-@@ -1451,19 +1399,12 @@ moz_gtk_entry_paint(cairo_t *cr, GdkRect
- {
- gint x = rect->x, y = rect->y, width = rect->width, height = rect->height;
- GtkStyleContext* style;
-- gboolean interior_focus;
-- gint focus_width;
- int draw_focus_outline_only = state->depressed; // NS_THEME_FOCUS_OUTLINE
-
- gtk_widget_set_direction(widget, direction);
-
- style = gtk_widget_get_style_context(widget);
-
-- gtk_widget_style_get(widget,
-- "interior-focus", &interior_focus,
-- "focus-line-width", &focus_width,
-- NULL);
--
- if (draw_focus_outline_only) {
- // Inflate the given 'rect' with the focus outline size.
- gint h, v;
-@@ -1495,14 +1436,6 @@ moz_gtk_entry_paint(cairo_t *cr, GdkRect
- /* This will get us the lit borders that focused textboxes enjoy on
- * some themes. */
- gtk_style_context_set_state(style, GTK_STATE_FLAG_FOCUSED);
-- if (!interior_focus) {
-- /* Indent the border a little bit if we have exterior focus
-- (this is what GTK does to draw native entries) */
-- x += focus_width;
-- y += focus_width;
-- width -= 2 * focus_width;
-- height -= 2 * focus_width;
-- }
- }
-
- if (state->disabled) {
-@@ -1514,11 +1447,6 @@ moz_gtk_entry_paint(cairo_t *cr, GdkRect
- }
- gtk_render_frame(style, cr, x, y, width, height);
-
-- if (state->focused && !state->disabled) {
-- if (!interior_focus) {
-- gtk_render_focus(style, cr, rect->x, rect->y, rect->width, rect->height);
-- }
-- }
- gtk_style_context_restore(style);
-
- return MOZ_GTK_SUCCESS;
-@@ -1823,8 +1751,6 @@ moz_gtk_container_paint(cairo_t *cr, Gdk
- GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state);
- GtkStyleContext* style;
- GtkWidget *widget;
-- gboolean interior_focus;
-- gint focus_width, focus_pad;
-
- if (isradio) {
- ensure_radiobutton_widget();
-@@ -1837,7 +1763,6 @@ moz_gtk_container_paint(cairo_t *cr, Gdk
-
- style = gtk_widget_get_style_context(widget);
- gtk_style_context_save(style);
-- moz_gtk_widget_get_focus(widget, &interior_focus, &focus_width, &focus_pad);
- gtk_style_context_set_state(style, state_flags);
-
- /* this is for drawing a prelight box */
-@@ -1846,10 +1771,6 @@ moz_gtk_container_paint(cairo_t *cr, Gdk
- rect->x, rect->y, rect->width, rect->height);
- }
-
-- if (state->focused && !interior_focus) {
-- gtk_render_focus(style, cr,
-- rect->x, rect->y, rect->width, rect->height);
-- }
- gtk_style_context_restore(style);
-
- return MOZ_GTK_SUCCESS;
-@@ -1862,7 +1783,6 @@ moz_gtk_toggle_label_paint(cairo_t *cr,
- {
- GtkStyleContext *style;
- GtkWidget *widget;
-- gboolean interior_focus;
-
- if (!state->focused)
- return MOZ_GTK_SUCCESS;
-@@ -1883,10 +1803,6 @@ moz_gtk_toggle_label_paint(cairo_t *cr,
- }
- gtk_widget_set_direction(widget, direction);
-
-- gtk_widget_style_get(widget, "interior-focus", &interior_focus, NULL);
-- if (!interior_focus)
-- return MOZ_GTK_SUCCESS;
--
- gtk_style_context_set_state(style, GetStateFlagsFromGtkWidgetState(state));
- gtk_render_focus(style, cr,
- rect->x, rect->y, rect->width, rect->height);
-@@ -2105,6 +2021,9 @@ moz_gtk_get_tab_thickness(void)
- GtkStyleContext * style;
-
- ensure_tab_widget();
-+ if (!notebook_has_tab_gap)
-+ return 0; /* tabs do not overdraw the tabpanel border with "no gap" style */
-+
- style = gtk_widget_get_style_context(gTabWidget);
- gtk_style_context_add_class(style, GTK_STYLE_CLASS_NOTEBOOK);
- gtk_style_context_get_border(style, 0, &border);
-@@ -2150,7 +2069,7 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan
- ensure_tab_widget();
- gtk_widget_set_direction(gTabWidget, direction);
-
-- style = gtk_widget_get_style_context(gTabWidget);
-+ style = gtk_widget_get_style_context(gTabWidget);
- gtk_style_context_save(style);
- moz_gtk_tab_prepare_style_context(style, flags);
-
-@@ -2167,143 +2086,155 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan
-
- focusRect = backRect = tabRect;
-
-- if ((flags & MOZ_GTK_TAB_SELECTED) == 0) {
-- /* Only draw the tab */
-- gtk_render_extension(style, cr,
-- tabRect.x, tabRect.y, tabRect.width, tabRect.height,
-- (flags & MOZ_GTK_TAB_BOTTOM) ?
-- GTK_POS_TOP : GTK_POS_BOTTOM );
-- } else {
-- /* Draw the tab and the gap
-- * We want the gap to be positioned exactly on the tabpanel top
-- * border; since tabbox.css may set a negative margin so that the tab
-- * frame rect already overlaps the tabpanel frame rect, we need to take
-- * that into account when drawing. To that effect, nsNativeThemeGTK
-- * passes us this negative margin (bmargin in the graphic below) in the
-- * lowest bits of |flags|. We use it to set gap_voffset, the distance
-- * between the top of the gap and the bottom of the tab (resp. the
-- * bottom of the gap and the top of the tab when we draw a bottom tab),
-- * while ensuring that the gap always touches the border of the tab,
-- * i.e. 0 <= gap_voffset <= gap_height, to avoid surprinsing results
-- * with big negative or positive margins.
-- * Here is a graphical explanation in the case of top tabs:
-- * ___________________________
-- * / \
-- * | T A B |
-- * ----------|. . . . . . . . . . . . . . .|----- top of tabpanel
-- * : ^ bmargin : ^
-- * : | (-negative margin, : |
-- * bottom : v passed in flags) : | gap_height
-- * of -> :.............................: | (the size of the
-- * the tab . part of the gap . | tabpanel top border)
-- * . outside of the tab . v
-- * ----------------------------------------------
-- *
-- * To draw the gap, we use gtk_paint_box_gap(), see comment in
-- * moz_gtk_tabpanels_paint(). This box_gap is made 3 * gap_height tall,
-- * which should suffice to ensure that the only visible border is the
-- * pierced one. If the tab is in the middle, we make the box_gap begin
-- * a bit to the left of the tab and end a bit to the right, adjusting
-- * the gap position so it still is under the tab, because we want the
-- * rendering of a gap in the middle of a tabpanel. This is the role of
-- * the gints gap_{l,r}_offset. On the contrary, if the tab is the
-- * first, we align the start border of the box_gap with the start
-- * border of the tab (left if LTR, right if RTL), by setting the
-- * appropriate offset to 0.*/
-- gint gap_loffset, gap_roffset, gap_voffset, gap_height;
--
-- /* Get height needed by the gap */
-- gap_height = moz_gtk_get_tab_thickness();
--
-- /* Extract gap_voffset from the first bits of flags */
-- gap_voffset = flags & MOZ_GTK_TAB_MARGIN_MASK;
-- if (gap_voffset > gap_height)
-- gap_voffset = gap_height;
--
-- /* Set gap_{l,r}_offset to appropriate values */
-- gap_loffset = gap_roffset = 20; /* should be enough */
-- if (flags & MOZ_GTK_TAB_FIRST) {
-- if (direction == GTK_TEXT_DIR_RTL)
-- gap_roffset = initial_gap;
-- else
-- gap_loffset = initial_gap;
-- }
--
-- if (flags & MOZ_GTK_TAB_BOTTOM) {
-- /* Draw the tab on bottom */
-- focusRect.y += gap_voffset;
-- focusRect.height -= gap_voffset;
--
-+ if (notebook_has_tab_gap) {
-+ if ((flags & MOZ_GTK_TAB_SELECTED) == 0) {
-+ /* Only draw the tab */
- gtk_render_extension(style, cr,
-- tabRect.x, tabRect.y + gap_voffset, tabRect.width,
-- tabRect.height - gap_voffset, GTK_POS_TOP);
--
-- gtk_style_context_remove_region(style, GTK_STYLE_REGION_TAB);
--
-- backRect.y += (gap_voffset - gap_height);
-- backRect.height = gap_height;
--
-- /* Draw the gap; erase with background color before painting in
-- * case theme does not */
-- gtk_render_background(style, cr, backRect.x, backRect.y,
-- backRect.width, backRect.height);
-- cairo_save(cr);
-- cairo_rectangle(cr, backRect.x, backRect.y, backRect.width, backRect.height);
-- cairo_clip(cr);
--
-- gtk_render_frame_gap(style, cr,
-- tabRect.x - gap_loffset,
-- tabRect.y + gap_voffset - 3 * gap_height,
-- tabRect.width + gap_loffset + gap_roffset,
-- 3 * gap_height, GTK_POS_BOTTOM,
-- gap_loffset, gap_loffset + tabRect.width);
-- cairo_restore(cr);
-+ tabRect.x, tabRect.y, tabRect.width, tabRect.height,
-+ (flags & MOZ_GTK_TAB_BOTTOM) ?
-+ GTK_POS_TOP : GTK_POS_BOTTOM );
- } else {
-- /* Draw the tab on top */
-- focusRect.height -= gap_voffset;
-- gtk_render_extension(style, cr,
-- tabRect.x, tabRect.y, tabRect.width,
-- tabRect.height - gap_voffset, GTK_POS_BOTTOM);
--
-- gtk_style_context_remove_region(style, GTK_STYLE_REGION_TAB);
--
-- backRect.y += (tabRect.height - gap_voffset);
-- backRect.height = gap_height;
-+ /* Draw the tab and the gap
-+ * We want the gap to be positioned exactly on the tabpanel top
-+ * border; since tabbox.css may set a negative margin so that the tab
-+ * frame rect already overlaps the tabpanel frame rect, we need to take
-+ * that into account when drawing. To that effect, nsNativeThemeGTK
-+ * passes us this negative margin (bmargin in the graphic below) in the
-+ * lowest bits of |flags|. We use it to set gap_voffset, the distance
-+ * between the top of the gap and the bottom of the tab (resp. the
-+ * bottom of the gap and the top of the tab when we draw a bottom tab),
-+ * while ensuring that the gap always touches the border of the tab,
-+ * i.e. 0 <= gap_voffset <= gap_height, to avoid surprinsing results
-+ * with big negative or positive margins.
-+ * Here is a graphical explanation in the case of top tabs:
-+ * ___________________________
-+ * / \
-+ * | T A B |
-+ * ----------|. . . . . . . . . . . . . . .|----- top of tabpanel
-+ * : ^ bmargin : ^
-+ * : | (-negative margin, : |
-+ * bottom : v passed in flags) : | gap_height
-+ * of -> :.............................: | (the size of the
-+ * the tab . part of the gap . | tabpanel top border)
-+ * . outside of the tab . v
-+ * ----------------------------------------------
-+ *
-+ * To draw the gap, we use gtk_paint_box_gap(), see comment in
-+ * moz_gtk_tabpanels_paint(). This box_gap is made 3 * gap_height tall,
-+ * which should suffice to ensure that the only visible border is the
-+ * pierced one. If the tab is in the middle, we make the box_gap begin
-+ * a bit to the left of the tab and end a bit to the right, adjusting
-+ * the gap position so it still is under the tab, because we want the
-+ * rendering of a gap in the middle of a tabpanel. This is the role of
-+ * the gints gap_{l,r}_offset. On the contrary, if the tab is the
-+ * first, we align the start border of the box_gap with the start
-+ * border of the tab (left if LTR, right if RTL), by setting the
-+ * appropriate offset to 0.*/
-+ gint gap_loffset, gap_roffset, gap_voffset, gap_height;
-+
-+ /* Get height needed by the gap */
-+ gap_height = moz_gtk_get_tab_thickness();
-+
-+ /* Extract gap_voffset from the first bits of flags */
-+ gap_voffset = flags & MOZ_GTK_TAB_MARGIN_MASK;
-+ if (gap_voffset > gap_height)
-+ gap_voffset = gap_height;
-+
-+ /* Set gap_{l,r}_offset to appropriate values */
-+ gap_loffset = gap_roffset = 20; /* should be enough */
-+ if (flags & MOZ_GTK_TAB_FIRST) {
-+ if (direction == GTK_TEXT_DIR_RTL)
-+ gap_roffset = initial_gap;
-+ else
-+ gap_loffset = initial_gap;
-+ }
-
-- /* Draw the gap; erase with background color before painting in
-- * case theme does not */
-- gtk_render_background(style, cr, backRect.x, backRect.y,
-- backRect.width, backRect.height);
--
-- cairo_save(cr);
-- cairo_rectangle(cr, backRect.x, backRect.y, backRect.width, backRect.height);
-- cairo_clip(cr);
--
-- gtk_render_frame_gap(style, cr,
-- tabRect.x - gap_loffset,
-- tabRect.y + tabRect.height - gap_voffset,
-- tabRect.width + gap_loffset + gap_roffset,
-- 3 * gap_height, GTK_POS_TOP,
-- gap_loffset, gap_loffset + tabRect.width);
-- cairo_restore(cr);
-+ if (flags & MOZ_GTK_TAB_BOTTOM) {
-+ /* Draw the tab on bottom */
-+ focusRect.y += gap_voffset;
-+ focusRect.height -= gap_voffset;
-+
-+ gtk_render_extension(style, cr,
-+ tabRect.x, tabRect.y + gap_voffset, tabRect.width,
-+ tabRect.height - gap_voffset, GTK_POS_TOP);
-+
-+ gtk_style_context_remove_region(style, GTK_STYLE_REGION_TAB);
-+
-+ backRect.y += (gap_voffset - gap_height);
-+ backRect.height = gap_height;
-+
-+ /* Draw the gap; erase with background color before painting in
-+ * case theme does not */
-+ gtk_render_background(style, cr, backRect.x, backRect.y,
-+ backRect.width, backRect.height);
-+ cairo_save(cr);
-+ cairo_rectangle(cr, backRect.x, backRect.y, backRect.width, backRect.height);
-+ cairo_clip(cr);
-+
-+ gtk_render_frame_gap(style, cr,
-+ tabRect.x - gap_loffset,
-+ tabRect.y + gap_voffset - 3 * gap_height,
-+ tabRect.width + gap_loffset + gap_roffset,
-+ 3 * gap_height, GTK_POS_BOTTOM,
-+ gap_loffset, gap_loffset + tabRect.width);
-+ cairo_restore(cr);
-+ } else {
-+ /* Draw the tab on top */
-+ focusRect.height -= gap_voffset;
-+ gtk_render_extension(style, cr,
-+ tabRect.x, tabRect.y, tabRect.width,
-+ tabRect.height - gap_voffset, GTK_POS_BOTTOM);
-+
-+ gtk_style_context_remove_region(style, GTK_STYLE_REGION_TAB);
-+
-+ backRect.y += (tabRect.height - gap_voffset);
-+ backRect.height = gap_height;
-+
-+ /* Draw the gap; erase with background color before painting in
-+ * case theme does not */
-+ gtk_render_background(style, cr, backRect.x, backRect.y,
-+ backRect.width, backRect.height);
-+
-+ cairo_save(cr);
-+ cairo_rectangle(cr, backRect.x, backRect.y, backRect.width, backRect.height);
-+ cairo_clip(cr);
-+
-+ gtk_render_frame_gap(style, cr,
-+ tabRect.x - gap_loffset,
-+ tabRect.y + tabRect.height - gap_voffset,
-+ tabRect.width + gap_loffset + gap_roffset,
-+ 3 * gap_height, GTK_POS_TOP,
-+ gap_loffset, gap_loffset + tabRect.width);
-+ cairo_restore(cr);
-+ }
- }
-+ } else {
-+ gtk_render_background(style, cr, tabRect.x, tabRect.y, tabRect.width, tabRect.height);
-+ gtk_render_frame(style, cr, tabRect.x, tabRect.y, tabRect.width, tabRect.height);
- }
-
-+ gtk_style_context_restore(style);
-+
- if (state->focused) {
- /* Paint the focus ring */
-- GtkBorder border;
-- gtk_style_context_get_border(style, GetStateFlagsFromGtkWidgetState(state), &border);
-+ GtkBorder padding;
-+
-+ gtk_style_context_save(style);
-+ moz_gtk_tab_prepare_style_context(style, flags);
-
-- focusRect.x += border.left;
-- focusRect.width -= (border.left + border.right);
-- focusRect.y += border.top;
-- focusRect.height -= (border.top + border.bottom);
-+ gtk_style_context_get_padding(style, GetStateFlagsFromGtkWidgetState(state), &padding);
-+
-+ focusRect.x += padding.left;
-+ focusRect.width -= (padding.left + padding.right);
-+ focusRect.y += padding.top;
-+ focusRect.height -= (padding.top + padding.bottom);
-
- gtk_render_focus(style, cr,
- focusRect.x, focusRect.y, focusRect.width, focusRect.height);
-+
-+ gtk_style_context_restore(style);
- }
-
-- gtk_style_context_restore(style);
-
- return MOZ_GTK_SUCCESS;
- }
-@@ -2684,26 +2615,18 @@ moz_gtk_get_widget_border(GtkThemeWidget
- switch (widget) {
- case MOZ_GTK_BUTTON:
- {
-- GtkBorder inner_border;
-- gboolean interior_focus;
-- gint focus_width, focus_pad;
--
- ensure_button_widget();
-+ style = gtk_widget_get_style_context(gButtonWidget);
-+
- *left = *top = *right = *bottom = gtk_container_get_border_width(GTK_CONTAINER(gButtonWidget));
-
- /* Don't add this padding in HTML, otherwise the buttons will
- become too big and stuff the layout. */
- if (!inhtml) {
-- moz_gtk_widget_get_focus(gButtonWidget, &interior_focus, &focus_width, &focus_pad);
-- moz_gtk_button_get_inner_border(gButtonWidget, &inner_border);
-- *left += focus_width + focus_pad + inner_border.left;
-- *right += focus_width + focus_pad + inner_border.right;
-- *top += focus_width + focus_pad + inner_border.top;
-- *bottom += focus_width + focus_pad + inner_border.bottom;
-+ moz_gtk_add_style_padding(style, left, top, right, bottom);
- }
-
-- moz_gtk_add_style_border(gtk_widget_get_style_context(gButtonWidget),
-- left, top, right, bottom);
-+ moz_gtk_add_style_border(style, left, top, right, bottom);
- return MOZ_GTK_SUCCESS;
- }
- case MOZ_GTK_ENTRY:
-@@ -2711,7 +2634,13 @@ moz_gtk_get_widget_border(GtkThemeWidget
- ensure_entry_widget();
- style = gtk_widget_get_style_context(gEntryWidget);
- moz_gtk_add_style_border(style, left, top, right, bottom);
-- moz_gtk_add_style_padding(style, left, top, right, bottom);
-+
-+ /* Use the document padding in HTML
-+ and GTK style padding in XUL. */
-+ if (!inhtml) {
-+ moz_gtk_add_style_padding(style, left, top, right, bottom);
-+ }
-+
- return MOZ_GTK_SUCCESS;
- }
- case MOZ_GTK_TREEVIEW:
-@@ -2731,23 +2660,15 @@ moz_gtk_get_widget_border(GtkThemeWidget
- * assigned.
- * That is why the following code is the same as for MOZ_GTK_BUTTON.
- * */
--
-- GtkBorder inner_border;
-- gboolean interior_focus;
-- gint focus_width, focus_pad;
-+ GtkStyleContext *style;
-
- ensure_tree_header_cell_widget();
- *left = *top = *right = *bottom = gtk_container_get_border_width(GTK_CONTAINER(gTreeHeaderCellWidget));
-
-- moz_gtk_widget_get_focus(gTreeHeaderCellWidget, &interior_focus, &focus_width, &focus_pad);
-- moz_gtk_button_get_inner_border(gTreeHeaderCellWidget, &inner_border);
-- *left += focus_width + focus_pad + inner_border.left;
-- *right += focus_width + focus_pad + inner_border.right;
-- *top += focus_width + focus_pad + inner_border.top;
-- *bottom += focus_width + focus_pad + inner_border.bottom;
--
-- moz_gtk_add_style_border(gtk_widget_get_style_context(gTreeHeaderCellWidget),
-- left, top, right, bottom);
-+ style = gtk_widget_get_style_context(gTreeHeaderCellWidget);
-+
-+ moz_gtk_add_style_border(style, left, top, right, bottom);
-+ moz_gtk_add_style_padding(style, left, top, right, bottom);
- return MOZ_GTK_SUCCESS;
- }
- case MOZ_GTK_TREE_HEADER_SORTARROW:
-@@ -2767,29 +2688,23 @@ moz_gtk_get_widget_border(GtkThemeWidget
- /* We need to account for the arrow on the dropdown, so text
- * doesn't come too close to the arrow, or in some cases spill
- * into the arrow. */
-- gboolean ignored_interior_focus, wide_separators;
-- gint focus_width, focus_pad, separator_width;
-+ gboolean wide_separators;
-+ gint separator_width;
- GtkRequisition arrow_req;
- GtkBorder border;
-
- ensure_combo_box_widgets();
-
-- *left = gtk_container_get_border_width(GTK_CONTAINER(gComboBoxButtonWidget));
-+ *left = *top = *right = *bottom =
-+ gtk_container_get_border_width(GTK_CONTAINER(gComboBoxButtonWidget));
-+
-+ style = gtk_widget_get_style_context(gComboBoxButtonWidget);
-
- if (!inhtml) {
-- moz_gtk_widget_get_focus(gComboBoxButtonWidget,
-- &ignored_interior_focus,
-- &focus_width, &focus_pad);
-- *left += focus_width + focus_pad;
-+ moz_gtk_add_style_padding(style, left, top, right, bottom);
- }
-
-- style = gtk_widget_get_style_context(gComboBoxButtonWidget);
-- gtk_style_context_get_border(style, 0, &border);
--
-- *top = *left + border.top;
-- *left += border.left;
--
-- *right = *left; *bottom = *top;
-+ moz_gtk_add_style_border(style, left, top, right, bottom);
-
- /* If there is no separator, don't try to count its width. */
- separator_width = 0;
-@@ -2841,60 +2756,23 @@ moz_gtk_get_widget_border(GtkThemeWidget
- ensure_frame_widget();
- w = gFrameWidget;
- break;
-- case MOZ_GTK_CHECKBUTTON_LABEL:
-- case MOZ_GTK_RADIOBUTTON_LABEL:
-- {
-- gboolean interior_focus;
-- gint focus_width, focus_pad;
--
-- /* If the focus is interior, then the label has a border of
-- (focus_width + focus_pad). */
-- if (widget == MOZ_GTK_CHECKBUTTON_LABEL) {
-- ensure_checkbox_widget();
-- moz_gtk_widget_get_focus(gCheckboxWidget, &interior_focus,
-- &focus_width, &focus_pad);
-- }
-- else {
-- ensure_radiobutton_widget();
-- moz_gtk_widget_get_focus(gRadiobuttonWidget, &interior_focus,
-- &focus_width, &focus_pad);
-- }
--
-- if (interior_focus)
-- *left = *top = *right = *bottom = (focus_width + focus_pad);
--
-- return MOZ_GTK_SUCCESS;
-- }
--
- case MOZ_GTK_CHECKBUTTON_CONTAINER:
- case MOZ_GTK_RADIOBUTTON_CONTAINER:
- {
-- gboolean interior_focus;
-- gint focus_width, focus_pad;
--
-- /* If the focus is _not_ interior, then the container has a border
-- of (focus_width + focus_pad). */
- if (widget == MOZ_GTK_CHECKBUTTON_CONTAINER) {
- ensure_checkbox_widget();
-- moz_gtk_widget_get_focus(gCheckboxWidget, &interior_focus,
-- &focus_width, &focus_pad);
- w = gCheckboxWidget;
- } else {
- ensure_radiobutton_widget();
-- moz_gtk_widget_get_focus(gRadiobuttonWidget, &interior_focus,
-- &focus_width, &focus_pad);
- w = gRadiobuttonWidget;
- }
-+ style = gtk_widget_get_style_context(w);
-
- *left = *top = *right = *bottom = gtk_container_get_border_width(GTK_CONTAINER(w));
--
-- if (!interior_focus) {
-- *left += (focus_width + focus_pad);
-- *right += (focus_width + focus_pad);
-- *top += (focus_width + focus_pad);
-- *bottom += (focus_width + focus_pad);
-- }
--
-+ moz_gtk_add_style_border(style,
-+ left, top, right, bottom);
-+ moz_gtk_add_style_padding(style,
-+ left, top, right, bottom);
- return MOZ_GTK_SUCCESS;
- }
- case MOZ_GTK_MENUPOPUP:
-@@ -2921,6 +2799,8 @@ moz_gtk_get_widget_border(GtkThemeWidget
- return MOZ_GTK_SUCCESS;
- }
- /* These widgets have no borders, since they are not containers. */
-+ case MOZ_GTK_CHECKBUTTON_LABEL:
-+ case MOZ_GTK_RADIOBUTTON_LABEL:
- case MOZ_GTK_SPLITTER_HORIZONTAL:
- case MOZ_GTK_SPLITTER_VERTICAL:
- case MOZ_GTK_CHECKBUTTON:
-@@ -2975,11 +2855,7 @@ moz_gtk_get_tab_border(gint* left, gint*
- gtk_style_context_save(style);
- moz_gtk_tab_prepare_style_context(style, flags);
-
-- // TODO add_style_border() should be replaced
-- // with focus-line-width and focus-padding
-- // see Bug 877605
- *left = *top = *right = *bottom = 0;
-- moz_gtk_add_style_border(style, left, top, right, bottom);
- moz_gtk_add_style_padding(style, left, top, right, bottom);
-
- gtk_widget_style_get (gTabWidget, "tab-curvature", &tab_curvature, NULL);
-@@ -2990,16 +2866,9 @@ moz_gtk_get_tab_border(gint* left, gint*
- int initial_gap;
- gtk_widget_style_get (gTabWidget, "initial-gap", &initial_gap, NULL);
- if (direction == GTK_TEXT_DIR_RTL)
-- *right += initial_gap;
-+ *right += initial_gap;
- else
-- *left += initial_gap;
-- }
--
-- // Top tabs have no bottom border, bottom tabs have no top border
-- if (flags & MOZ_GTK_TAB_BOTTOM) {
-- *top = 0;
-- } else {
-- *bottom = 0;
-+ *left += initial_gap;
- }
-
- gtk_style_context_restore(style);
diff --git a/security/tor-browser/patches/patch-widget_gtk_gtkdrawing.h b/security/tor-browser/patches/patch-widget_gtk_gtkdrawing.h
deleted file mode 100644
index 1f3d4b54b8a..00000000000
--- a/security/tor-browser/patches/patch-widget_gtk_gtkdrawing.h
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-widget_gtk_gtkdrawing.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- widget/gtk/gtkdrawing.h.orig 2015-03-27 02:20:33.000000000 +0000
-+++ widget/gtk/gtkdrawing.h
-@@ -293,16 +293,6 @@ moz_gtk_checkbox_get_metrics(gint* indic
- gint
- moz_gtk_radio_get_metrics(gint* indicator_size, gint* indicator_spacing);
-
--/**
-- * Get the inner-border value for a GtkButton widget (button or tree header)
-- * widget: [IN] the widget to get the border value for
-- * inner_border: [OUT] the inner border
-- *
-- * returns: MOZ_GTK_SUCCESS if there was no error, an error code otherwise
-- */
--gint
--moz_gtk_button_get_inner_border(GtkWidget* widget, GtkBorder* inner_border);
--
- /** Get the extra size for the focus ring for outline:auto.
- * widget: [IN] the widget to get the focus metrics for
- * focus_h_width: [OUT] the horizontal width
-@@ -313,19 +303,6 @@ moz_gtk_button_get_inner_border(GtkWidge
- gint
- moz_gtk_get_focus_outline_size(gint* focus_h_width, gint* focus_v_width);
-
--/** Get the focus metrics for a treeheadercell, button, checkbox, or radio button.
-- * widget: [IN] the widget to get the focus metrics for
-- * interior_focus: [OUT] whether the focus is drawn around the
-- * label (TRUE) or around the whole container (FALSE)
-- * focus_width: [OUT] the width of the focus line
-- * focus_pad: [OUT] the padding between the focus line and children
-- *
-- * returns: MOZ_GTK_SUCCESS if there was no error, an error code otherwise
-- */
--gint
--moz_gtk_widget_get_focus(GtkWidget* widget, gboolean* interior_focus,
-- gint* focus_width, gint* focus_pad);
--
- /** Get the horizontal padding for the menuitem widget or checkmenuitem widget.
- * horizontal_padding: [OUT] The left and right padding of the menuitem or checkmenuitem
- *
diff --git a/security/tor-browser/patches/patch-widget_gtk_nsNativeThemeGTK.cpp b/security/tor-browser/patches/patch-widget_gtk_nsNativeThemeGTK.cpp
deleted file mode 100644
index 30e038f5b0f..00000000000
--- a/security/tor-browser/patches/patch-widget_gtk_nsNativeThemeGTK.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-widget_gtk_nsNativeThemeGTK.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- widget/gtk/nsNativeThemeGTK.cpp.orig 2015-05-04 00:43:35.000000000 +0000
-+++ widget/gtk/nsNativeThemeGTK.cpp
-@@ -761,6 +761,8 @@ nsNativeThemeGTK::GetExtraSizeForWidget(
- return false;
-
- gint gap_height = moz_gtk_get_tab_thickness();
-+ if (!gap_height)
-+ return false;
-
- int32_t extra = gap_height - GetTabMarginPixels(aFrame);
- if (extra <= 0)
-@@ -1528,9 +1530,15 @@ nsNativeThemeGTK::GetWidgetTransparency(
- case NS_THEME_MENUPOPUP:
- case NS_THEME_WINDOW:
- case NS_THEME_DIALOG:
-- // Tooltips use gtk_paint_flat_box().
-+ return eOpaque;
-+ // Tooltips use gtk_paint_flat_box() on Gtk2
-+ // but are shaped on Gtk3
- case NS_THEME_TOOLTIP:
-+#if (MOZ_WIDGET_GTK == 2)
- return eOpaque;
-+#else
-+ return eTransparent;
-+#endif
- }
-
- return eUnknownTransparency;
diff --git a/security/tor-browser/patches/patch-xpcom_base_nsStackWalk.cpp b/security/tor-browser/patches/patch-xpcom_base_nsStackWalk.cpp
deleted file mode 100644
index f6f41d13a8f..00000000000
--- a/security/tor-browser/patches/patch-xpcom_base_nsStackWalk.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-xpcom_base_nsStackWalk.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
-* Replace XP_MACOSX with XP_DARWIN as the former is not defined when
- the toolkit is not cocoa.
-
---- xpcom/base/nsStackWalk.cpp.orig 2015-05-04 00:43:35.000000000 +0000
-+++ xpcom/base/nsStackWalk.cpp
-@@ -34,12 +34,12 @@ static CriticalAddress gCriticalAddress;
- #define _GNU_SOURCE
- #endif
-
--#if defined(HAVE_DLOPEN) || defined(XP_MACOSX)
-+#if defined(HAVE_DLOPEN) || defined(XP_DARWIN)
- #include <dlfcn.h>
- #endif
-
--#define NSSTACKWALK_SUPPORTS_MACOSX \
-- (defined(XP_MACOSX) && \
-+#define NSSTACKWALK_SUPPORTS_DARWIN \
-+ (defined(XP_DARWIN) && \
- (defined(__i386) || defined(__ppc__) || defined(HAVE__UNWIND_BACKTRACE)))
-
- #define NSSTACKWALK_SUPPORTS_LINUX \
-@@ -47,7 +47,7 @@ static CriticalAddress gCriticalAddress;
- ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
- defined(HAVE__UNWIND_BACKTRACE)))
-
--#if NSSTACKWALK_SUPPORTS_MACOSX
-+#if NSSTACKWALK_SUPPORTS_DARWIN
- #include <pthread.h>
- #include <CoreServices/CoreServices.h>
-
-@@ -830,7 +830,7 @@ NS_DescribeCodeAddress(void* aPC, nsCode
- }
-
- // i386 or PPC Linux stackwalking code
--#elif HAVE_DLADDR && (HAVE__UNWIND_BACKTRACE || NSSTACKWALK_SUPPORTS_LINUX || NSSTACKWALK_SUPPORTS_MACOSX)
-+#elif HAVE_DLADDR && (HAVE__UNWIND_BACKTRACE || NSSTACKWALK_SUPPORTS_LINUX || NSSTACKWALK_SUPPORTS_DARWIN)
-
- #include <stdlib.h>
- #include <string.h>
-@@ -901,7 +901,7 @@ FramePointerStackWalk(NS_WalkStackCallba
- (long(next) & 3)) {
- break;
- }
--#if (defined(__ppc__) && defined(XP_MACOSX)) || defined(__powerpc64__)
-+#if (defined(__ppc__) && defined(XP_DARWIN)) || defined(__powerpc64__)
- // ppc mac or powerpc64 linux
- void* pc = *(bp + 2);
- bp += 3;
-@@ -931,7 +931,7 @@ FramePointerStackWalk(NS_WalkStackCallba
- }
-
- #define X86_OR_PPC (defined(__i386) || defined(PPC) || defined(__ppc__))
--#if X86_OR_PPC && (NSSTACKWALK_SUPPORTS_MACOSX || NSSTACKWALK_SUPPORTS_LINUX) // i386 or PPC Linux or Mac stackwalking code
-+#if X86_OR_PPC && (NSSTACKWALK_SUPPORTS_DARWIN || NSSTACKWALK_SUPPORTS_LINUX) // i386 or PPC Linux or Mac stackwalking code
-
- XPCOM_API(nsresult)
- NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames,
diff --git a/security/tor-browser/patches/patch-xpcom_base_nscore.h b/security/tor-browser/patches/patch-xpcom_base_nscore.h
index be4fb860029..3ca5f01f32e 100644
--- a/security/tor-browser/patches/patch-xpcom_base_nscore.h
+++ b/security/tor-browser/patches/patch-xpcom_base_nscore.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-xpcom_base_nscore.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-xpcom_base_nscore.h,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- xpcom/base/nscore.h.orig 2014-05-29 23:31:50.000000000 +0000
+++ xpcom/base/nscore.h
diff --git a/security/tor-browser/patches/patch-xpcom_build_PoisonIOInterposer.h b/security/tor-browser/patches/patch-xpcom_build_PoisonIOInterposer.h
index 02b3ff85fec..16c1364d9c8 100644
--- a/security/tor-browser/patches/patch-xpcom_build_PoisonIOInterposer.h
+++ b/security/tor-browser/patches/patch-xpcom_build_PoisonIOInterposer.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-xpcom_build_PoisonIOInterposer.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-xpcom_build_PoisonIOInterposer.h,v 1.2 2017/01/22 12:27:22 ryoon Exp $
Replace XP_MACOSX with XP_DARWIN as the former is not defined when the
toolkit is not cocoa.
diff --git a/security/tor-browser/patches/patch-xpcom_build_XPCOMInit.cpp b/security/tor-browser/patches/patch-xpcom_build_XPCOMInit.cpp
deleted file mode 100644
index 063e3a44656..00000000000
--- a/security/tor-browser/patches/patch-xpcom_build_XPCOMInit.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-xpcom_build_XPCOMInit.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
---- xpcom/build/XPCOMInit.cpp.orig 2015-05-04 00:43:36.000000000 +0000
-+++ xpcom/build/XPCOMInit.cpp
-@@ -141,7 +141,9 @@ extern nsresult nsStringInputStreamConst
- #include "mozilla/VisualEventTracer.h"
- #endif
-
-+#ifndef MOZ_OGG_NO_MEM_REPORTING
- #include "ogg/ogg.h"
-+#endif
- #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING)
- #if defined(HAVE_STDINT_H)
- // mozilla-config.h defines HAVE_STDINT_H, and then it's defined *again* in
-@@ -669,11 +671,13 @@ NS_InitXPCOM2(nsIServiceManager** aResul
- // this oddness.
- mozilla::SetICUMemoryFunctions();
-
-+#ifndef MOZ_OGG_NO_MEM_REPORTING
- // Do the same for libogg.
- ogg_set_mem_functions(OggReporter::CountingMalloc,
- OggReporter::CountingCalloc,
- OggReporter::CountingRealloc,
- OggReporter::CountingFree);
-+#endif
-
- #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING)
- // And for VPX.
diff --git a/security/tor-browser/patches/patch-xpcom_components_Module.h b/security/tor-browser/patches/patch-xpcom_components_Module.h
index 44abb8bfd51..666ab8c2d5c 100644
--- a/security/tor-browser/patches/patch-xpcom_components_Module.h
+++ b/security/tor-browser/patches/patch-xpcom_components_Module.h
@@ -1,8 +1,10 @@
-$NetBSD: patch-xpcom_components_Module.h,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-xpcom_components_Module.h,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- xpcom/components/Module.h.orig 2016-01-21 05:38:42.000000000 +0000
+* Workaround for binutils/GNU ld 2.26 from NetBSD/amd64 7.99.26
+
+--- xpcom/components/Module.h.orig 2016-01-23 23:23:51.000000000 +0000
+++ xpcom/components/Module.h
-@@ -124,7 +124,7 @@ struct Module
+@@ -125,7 +125,7 @@ struct Module
# define NSMODULE_SECTION __declspec(allocate(".kPStaticModules$M"), dllexport)
# elif defined(__GNUC__)
# if defined(__ELF__)
diff --git a/security/tor-browser/patches/patch-xpcom_glue_standalone_nsXPCOMGlue.cpp b/security/tor-browser/patches/patch-xpcom_glue_standalone_nsXPCOMGlue.cpp
deleted file mode 100644
index ba8c4579ee6..00000000000
--- a/security/tor-browser/patches/patch-xpcom_glue_standalone_nsXPCOMGlue.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-xpcom_glue_standalone_nsXPCOMGlue.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
-Fix inconsistent use of XP_DARWIN and XP_MACOSX: LEADING_UNDERSCORE
-should be empty when we are going to load XPCOM using dlopen(3), not
-NSAddImage().
-
---- xpcom/glue/standalone/nsXPCOMGlue.cpp.orig 2015-01-30 05:17:58.000000000 +0000
-+++ xpcom/glue/standalone/nsXPCOMGlue.cpp
-@@ -30,7 +30,7 @@ static bool do_preload = false;
- #endif
-
- #if defined(SUNOS4) || defined(NEXTSTEP) || \
-- defined(XP_DARWIN) || \
-+ defined(XP_MACOSX) || \
- (defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__)
- #define LEADING_UNDERSCORE "_"
- #else
diff --git a/security/tor-browser/patches/patch-xpcom_io_TorFileUtils.cpp b/security/tor-browser/patches/patch-xpcom_io_TorFileUtils.cpp
new file mode 100644
index 00000000000..ba80981e98f
--- /dev/null
+++ b/security/tor-browser/patches/patch-xpcom_io_TorFileUtils.cpp
@@ -0,0 +1,23 @@
+$NetBSD: patch-xpcom_io_TorFileUtils.cpp,v 1.1 2017/01/22 12:27:22 ryoon Exp $
+
+--- xpcom/io/TorFileUtils.cpp.orig 2016-12-10 08:02:57.000000000 +0000
++++ xpcom/io/TorFileUtils.cpp
+@@ -15,7 +15,17 @@ TorBrowser_GetUserDataDir(nsIFile *aExeF
+ NS_ENSURE_ARG_POINTER(aFile);
+ nsCOMPtr<nsIFile> tbDataDir;
+
+-#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR
++#if defined(TOR_BROWSER_DATA_IN_HOME_DIR)
++ const char *homeDir = getenv("HOME");
++ if (!homeDir || !*homeDir)
++ return NS_ERROR_FAILURE;
++ nsresult rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
++ getter_AddRefs(tbDataDir));
++ NS_ENSURE_SUCCESS(rv, rv);
++ nsAutoCString leafSubdir(NS_LITERAL_CSTRING("TorBrowser-Data"));
++ rv = tbDataDir->AppendNative(leafSubdir);
++ NS_ENSURE_SUCCESS(rv, rv);
++#elif defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR)
+ nsAutoCString tbDataLeafName(NS_LITERAL_CSTRING("TorBrowser-Data"));
+ nsCOMPtr<nsIFile> appRootDir;
+ nsresult rv = GetAppRootDir(aExeFile, getter_AddRefs(appRootDir));
diff --git a/security/tor-browser/patches/patch-xpcom_io_nsAppFileLocationProvider.cpp b/security/tor-browser/patches/patch-xpcom_io_nsAppFileLocationProvider.cpp
deleted file mode 100644
index eebe3d7e496..00000000000
--- a/security/tor-browser/patches/patch-xpcom_io_nsAppFileLocationProvider.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-xpcom_io_nsAppFileLocationProvider.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
-
-https://github.com/torbsd/openbsd-ports/blob/6bce5893badd924a4090fffa1998220505520661/www/tbb/tor-browser/patches/patch-xpcom_io_nsAppFileLocationProvider_cpp
-
---- xpcom/io/nsAppFileLocationProvider.cpp.orig 2016-02-13 07:06:53.000000000 +0000
-+++ xpcom/io/nsAppFileLocationProvider.cpp
-@@ -295,6 +295,7 @@ nsAppFileLocationProvider::GetProductDir
- bool exists;
- nsCOMPtr<nsIFile> localDir;
-
-+#if 0
- rv = CloneMozBinDirectory(getter_AddRefs(localDir));
- NS_ENSURE_SUCCESS(rv, rv);
-
-@@ -328,6 +329,12 @@ nsAppFileLocationProvider::GetProductDir
- XPCOM_FILE_PATH_SEPARATOR "Data"
- XPCOM_FILE_PATH_SEPARATOR "Browser"));
- NS_ENSURE_SUCCESS(rv, rv);
-+#endif
-+ rv = NS_NewNativeLocalFile(nsDependentCString(PR_GetEnv("HOME")), true, getter_AddRefs(localDir));
-+ if (NS_FAILED(rv)) return rv;
-+
-+ rv = localDir->AppendRelativeNativePath(DEFAULT_PRODUCT_DIR);
-+ if (NS_FAILED(rv)) return rv;
-
- if (aLocal) {
- rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches"));
diff --git a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_Makefile.in b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_Makefile.in
index 676c4c2c9f0..28a937bac64 100644
--- a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_Makefile.in
+++ b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_Makefile.in
@@ -1,11 +1,15 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_Makefile.in,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_Makefile.in,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- xpcom/reflect/xptcall/md/unix/Makefile.in.orig 2014-10-11 09:06:50.000000000 +0000
+--- xpcom/reflect/xptcall/md/unix/Makefile.in.orig 2015-08-24 21:53:22.000000000 +0000
+++ xpcom/reflect/xptcall/md/unix/Makefile.in
-@@ -56,6 +56,39 @@ endif
- # SPARC
- ######################################################################
- #
+@@ -42,6 +42,43 @@ ifeq ($(OS_ARCH),AIX)
+ CXXFLAGS := $(filter-out $(MOZ_OPTIMIZE_FLAGS), $(CXXFLAGS))
+ endif
+
++######################################################################
++# SPARC
++######################################################################
++#
+# Linux/SPARC
+#
+ifeq ($(OS_ARCH),Linux)
@@ -38,7 +42,7 @@ $NetBSD: patch-xpcom_reflect_xptcall_md_unix_Makefile.in,v 1.1 2016/02/14 07:30:
+CPPSRCS := xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_openbsd.cpp
+ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_netbsd.s
+endif
-+#
- # Solaris/SPARC
- #
- ifeq ($(OS_ARCH),SunOS)
++
+ include $(topsrcdir)/config/rules.mk
+
+ ifeq ($(OS_ARCH),Linux)
diff --git a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build
index 9ac5df14db5..cece431b297 100644
--- a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build
+++ b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build
@@ -1,6 +1,6 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_moz.build,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_moz.build,v 1.2 2017/01/22 12:27:22 ryoon Exp $
---- xpcom/reflect/xptcall/md/unix/moz.build.orig 2015-03-27 02:20:33.000000000 +0000
+--- xpcom/reflect/xptcall/md/unix/moz.build.orig 2015-08-24 21:53:22.000000000 +0000
+++ xpcom/reflect/xptcall/md/unix/moz.build
@@ -9,7 +9,7 @@ if CONFIG['OS_ARCH'] == 'Darwin':
'xptcinvoke_darwin.cpp',
@@ -9,9 +9,9 @@ $NetBSD: patch-xpcom_reflect_xptcall_md_unix_moz.build,v 1.1 2016/02/14 07:30:54
- if CONFIG['OS_TEST'] == 'powerpc':
+ if CONFIG['OS_TEST'] == 'ppc':
SOURCES += [
+ '!xptcstubs_asm_ppc_darwin.s',
'xptcinvoke_asm_ppc_rhapsody.s',
- ]
-@@ -26,7 +26,7 @@ if CONFIG['OS_ARCH'] == 'GNU':
+@@ -24,7 +24,7 @@ if CONFIG['OS_ARCH'] == 'GNU':
'xptcstubs_gcc_x86_unix.cpp'
]
diff --git a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp
index 2d2311ef241..3c2f0652bf8 100644
--- a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp
+++ b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- xpcom/reflect/xptcall/md/unix/xptcinvoke_arm_netbsd.cpp.orig 2014-11-13 22:50:21.000000000 +0000
+++ xpcom/reflect/xptcall/md/unix/xptcinvoke_arm_netbsd.cpp
diff --git a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S
index 92ac2e77058..e5ca8dfc6e6 100644
--- a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S
+++ b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S
@@ -1,4 +1,4 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_mips.S.orig 2014-10-11 09:06:50.000000000 +0000
+++ xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_mips.S
diff --git a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s
index e6518d2926f..8c6537aba1f 100644
--- a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s
+++ b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s
@@ -1,4 +1,4 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig 2014-10-11 09:06:50.000000000 +0000
+++ xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc_netbsd.s
diff --git a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp
index e66b32d36c7..ece71e58e7d 100644
--- a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp
+++ b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- xpcom/reflect/xptcall/md/unix/xptcinvoke_gcc_x86_unix.cpp.orig 2014-10-11 09:06:50.000000000 +0000
+++ xpcom/reflect/xptcall/md/unix/xptcinvoke_gcc_x86_unix.cpp
diff --git a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp
index a20f35cb415..c95265641cb 100644
--- a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp
+++ b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- xpcom/reflect/xptcall/md/unix/xptcinvoke_netbsd_m68k.cpp.orig 2014-10-11 09:06:50.000000000 +0000
+++ xpcom/reflect/xptcall/md/unix/xptcinvoke_netbsd_m68k.cpp
diff --git a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp
index 11b8eac0e8f..c6561bd4092 100644
--- a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp
+++ b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_netbsd.cpp.orig 2014-10-11 09:06:50.000000000 +0000
+++ xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_netbsd.cpp
diff --git a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp
index e9a12421f57..00e208f98e1 100644
--- a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp
+++ b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc64_netbsd.cpp.orig 2014-10-14 18:49:14.000000000 +0000
+++ xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc64_netbsd.cpp
diff --git a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp
index 4577eccc666..be0dc38206c 100644
--- a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp
+++ b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- xpcom/reflect/xptcall/md/unix/xptcstubs_arm_netbsd.cpp.orig 2014-11-26 12:30:27.000000000 +0000
+++ xpcom/reflect/xptcall/md/unix/xptcstubs_arm_netbsd.cpp
diff --git a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S
index 158676997e7..1310a588f90 100644
--- a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S
+++ b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S
@@ -1,4 +1,4 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- xpcom/reflect/xptcall/md/unix/xptcstubs_asm_mips.S.orig 2014-10-11 09:06:50.000000000 +0000
+++ xpcom/reflect/xptcall/md/unix/xptcstubs_asm_mips.S
diff --git a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s
index e902d6a59b2..21e73be460b 100644
--- a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s
+++ b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s
@@ -1,4 +1,4 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- xpcom/reflect/xptcall/md/unix/xptcstubs_asm_sparc64_netbsd.s.orig 2014-10-14 18:49:14.000000000 +0000
+++ xpcom/reflect/xptcall/md/unix/xptcstubs_asm_sparc64_netbsd.s
diff --git a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp
index 11712d347d6..c688242d52f 100644
--- a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp
+++ b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- xpcom/reflect/xptcall/md/unix/xptcstubs_gcc_x86_unix.cpp.orig 2014-10-11 09:06:50.000000000 +0000
+++ xpcom/reflect/xptcall/md/unix/xptcstubs_gcc_x86_unix.cpp
diff --git a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp
index af7b0541869..d3d67796ff5 100644
--- a/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp
+++ b/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
--- xpcom/reflect/xptcall/md/unix/xptcstubs_netbsd_m68k.cpp.orig 2014-10-11 09:06:50.000000000 +0000
+++ xpcom/reflect/xptcall/md/unix/xptcstubs_netbsd_m68k.cpp
diff --git a/security/tor-browser/patches/patch-xulrunner_installer_Makefile.in b/security/tor-browser/patches/patch-xulrunner_installer_Makefile.in
index 42cc0618985..f3b0ee317f6 100644
--- a/security/tor-browser/patches/patch-xulrunner_installer_Makefile.in
+++ b/security/tor-browser/patches/patch-xulrunner_installer_Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-xulrunner_installer_Makefile.in,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+$NetBSD: patch-xulrunner_installer_Makefile.in,v 1.2 2017/01/22 12:27:22 ryoon Exp $
* Install pkg-config pc files to package specific directory.