pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/security/tor-browser



Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Feb 25 15:32:24 UTC 2019

Modified Files:
        pkgsrc/security/tor-browser: Makefile PLIST distinfo
        pkgsrc/security/tor-browser/patches: patch-aa
            patch-image_decoders_nsJPEGDecoder.cpp
            patch-ipc_chromium_src_base_message__pump__libevent.cc
            patch-ipc_chromium_src_base_platform__thread__posix.cc
            patch-ipc_glue_GeckoChildProcessHost.cpp
            patch-media_libcubeb_src_cubeb.c
            patch-media_libcubeb_src_cubeb__alsa.c
            patch-media_libcubeb_src_cubeb__oss.c
            patch-media_libcubeb_src_moz.build patch-media_libpng_pngpriv.h
            patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
            patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc
            patch-toolkit_library_moz.build patch-toolkit_xre_glxtest.cpp
            patch-xpcom_base_nscore.h patch-xpcom_io_TorFileUtils.cpp
            patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp
Added Files:
        pkgsrc/security/tor-browser/patches: patch-.mozconfig
            patch-browser_app_profile_firefox.js
            patch-build_moz.configure_old.configure
            patch-build_moz.configure_rust.configure
            patch-dom_fetch_FetchConsumer.cpp patch-dom_media_CubebUtils.cpp
            patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp
            patch-gfx_webrender_src_query.rs
            patch-ipc_chromium_src_base_lock__impl__posix.cc
            patch-ipc_glue_CrossProcessSemaphore.h
            patch-ipc_glue_CrossProcessSemaphore__posix.cpp
            patch-js_src_gc_Memory.cpp patch-js_src_threading_posix_Thread.cpp
            patch-js_src_util_NativeStack.cpp
            patch-js_src_wasm_WasmSignalHandlers.cpp
            patch-media_libcubeb_gtest_moz.build patch-media_libcubeb_update.sh
            patch-media_libyuv_libyuv_source_mjpeg__decoder.cc
            patch-media_webrtc_trunk_webrtc_modules_audio__device_linux_audio__device__alsa__linux.cc
            patch-modules_pdfium_update.sh
            patch-servo_components_style_build__gecko.rs
            patch-toolkit_components_terminator_nsTerminator.cpp
            patch-toolkit_moz.configure
            patch-toolkit_mozapps_installer_packager.mk
            patch-xpcom_build_BinaryPath.h
Removed Files:
        pkgsrc/security/tor-browser/patches: patch-ao patch-as patch-bf
            patch-browser_installer_package-manifest.in
            patch-build_autoconf_compiler-opts.m4 patch-build_autoconf_nss.m4
            patch-build_gyp.mozbuild patch-build_pgo_profileserver.py
            patch-config_Makefile.in patch-config_baseconfig.mk
            patch-config_external_moz.build patch-config_rules.mk
            patch-config_stl__wrappers_ios patch-config_stl__wrappers_ostream
            patch-config_system-headers patch-config_system__wrappers_unwind.h
            patch-dom_base_DOMRequest.cpp patch-dom_base_moz.build
            patch-dom_media_gstreamer_GStreamerAllocator.cpp
            patch-dom_media_moz.build
            patch-dom_plugins_ipc_PluginModuleChild.cpp
            patch-dom_plugins_ipc_PluginModuleChild.h
            patch-dom_plugins_ipc_PluginProcessChild.cpp
            patch-dom_system_OSFileConstants.cpp
            patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp
            patch-gfx_cairo_libpixman_src_pixman-arm-neon-asm.S
            patch-gfx_gl_GLContextProviderGLX.cpp
            patch-gfx_graphite2_src_Bidi.cpp patch-gfx_moz.build
            patch-gfx_skia_generate__mozbuild.py patch-gfx_skia_moz.build
            patch-gfx_skia_skia_src_core_SkUtilsArm.cpp
            patch-gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp
            patch-gfx_skia_skia_src_opts_memset.arm.S
            patch-gfx_thebes_moz.build patch-gfx_ycbcr_moz.build
            patch-gfx_ycbcr_yuv__row__arm.S
            patch-intl_hyphenation_glue_hnjalloc.h
            patch-ipc_chromium_src_base_atomicops.h
            patch-ipc_chromium_src_base_file__util__posix.cc
            patch-ipc_chromium_src_base_message__loop.cc
            patch-ipc_chromium_src_base_platform__thread.h
            patch-ipc_chromium_src_base_process__util.h
            patch-ipc_chromium_src_base_process__util__bsd.cc
            patch-ipc_chromium_src_base_process__util__posix.cc
            patch-ipc_chromium_src_base_scoped__nsautorelease__pool.h
            patch-ipc_chromium_src_base_sys__info__posix.cc
            patch-ipc_chromium_src_base_time__posix.cc
            patch-ipc_chromium_src_build_build__config.h
            patch-ipc_chromium_src_chrome_common_transport__dib.h
            patch-ipc_glue_StringUtil.cpp patch-ipc_glue_moz.build
            patch-js__src__vm__SPSProfiler.cpp patch-js_src_ctypes_CTypes.h
            patch-js_src_frontend_ParseMaps.cpp patch-js_src_jit-LIR.cpp
            patch-js_src_jit_MIR.cpp patch-js_src_jit_arm_Architecture-arm.cpp
            patch-js_src_jsdate.cpp patch-js_src_jskwgen.cpp
            patch-js_src_jsmath.cpp patch-js_src_shell_jsoptparse.cpp
            patch-js_xpconnect_src_XPCConvert.cpp
            patch-js_xpconnect_src_xpcprivate.h
            patch-media_libsoundtouch_src_cpu__detect__x86.cpp
            patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h
            patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp
            patch-media_libstagefright_system_core_liblog_fake__log__device.c
            patch-media_libstagefright_system_core_liblog_logprint.c
            patch-media_libtheora_lib_arm_armcpu.c
            patch-media_libtheora_lib_info.c patch-media_libtheora_moz.build
            patch-media_libtremor_Makefile.in patch-media_libtremor_moz.build
            patch-media_libvorbis_Makefile.in
            patch-media_libvorbis_lib_vorbis_info.c
            patch-media_libvorbis_moz.build
            patch-media_libyuv_include_libyuv_scale__row.h
            patch-media_mtransport_third__party_nICEr_src_util_mbslen.c
            patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h
            patch-media_openmax__dl_dl_api_armCOMM__s.h
            patch-media_webrtc_signaling_test_common.build
            patch-media_webrtc_trunk_webrtc_build_common.gypi
            patch-media_webrtc_trunk_webrtc_modules_audio__coding_neteq_neteq.gypi
            patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.cc
            patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.h
            patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi
            patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp
            patch-memory_build_mozjemalloc__compat.c
            patch-memory_mozalloc_mozalloc__abort.cpp
            patch-memory_volatile_VolatileBufferOSX.cpp patch-mfbt_Attributes.h
            patch-mfbt_Poison.cpp patch-modules_libjar_nsZipArchive.cpp
            patch-modules_libpref_init_all.js patch-mozglue_build_arm.cpp
            patch-mozglue_build_arm.h patch-netwerk_dns_moz.build
            patch-netwerk_protocol_http_Http2Session.cpp patch-pb patch-pc
            patch-rc patch-storage_SQLiteMutex.h
            patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h
            patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h
            patch-toolkit_xre_nsAppRunner.cpp
            patch-toolkit_xre_nsEmbedFunctions.cpp patch-webapprt_moz.build
            patch-xpcom_build_PoisonIOInterposer.h
            patch-xpcom_components_Module.h
            patch-xpcom_reflect_xptcall_md_unix_Makefile.in
            patch-xpcom_reflect_xptcall_md_unix_moz.build
            patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp
            patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S
            patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s
            patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp
            patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp
            patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp
            patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp
            patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S
            patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s
            patch-xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp
            patch-xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp
            patch-xulrunner_installer_Makefile.in

Log Message:
tor-browser: update to 8.5.

This is based on a git checkout from a couple days ago; not completely
sure about the version number.

The Makefile now contains a short how-to for updating this package.

Many thanks for the www/firefox60 patches!

Use at your own risk!
Survives basic browsing and check.torproject.org claims it connects via tor.

Changes: too many to document.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/security/tor-browser/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/tor-browser/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/tor-browser/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/tor-browser/patches/patch-.mozconfig \
    pkgsrc/security/tor-browser/patches/patch-browser_app_profile_firefox.js \
    pkgsrc/security/tor-browser/patches/patch-build_moz.configure_old.configure \
    pkgsrc/security/tor-browser/patches/patch-build_moz.configure_rust.configure \
    pkgsrc/security/tor-browser/patches/patch-dom_fetch_FetchConsumer.cpp \
    pkgsrc/security/tor-browser/patches/patch-dom_media_CubebUtils.cpp \
    pkgsrc/security/tor-browser/patches/patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp \
    pkgsrc/security/tor-browser/patches/patch-gfx_webrender_src_query.rs \
    pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_lock__impl__posix.cc \
    pkgsrc/security/tor-browser/patches/patch-ipc_glue_CrossProcessSemaphore.h \
    pkgsrc/security/tor-browser/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp \
    pkgsrc/security/tor-browser/patches/patch-js_src_gc_Memory.cpp \
    pkgsrc/security/tor-browser/patches/patch-js_src_threading_posix_Thread.cpp \
    pkgsrc/security/tor-browser/patches/patch-js_src_util_NativeStack.cpp \
    pkgsrc/security/tor-browser/patches/patch-js_src_wasm_WasmSignalHandlers.cpp \
    pkgsrc/security/tor-browser/patches/patch-media_libcubeb_gtest_moz.build \
    pkgsrc/security/tor-browser/patches/patch-media_libcubeb_update.sh \
    pkgsrc/security/tor-browser/patches/patch-media_libyuv_libyuv_source_mjpeg__decoder.cc \
    pkgsrc/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_audio__device_linux_audio__device__alsa__linux.cc \
    pkgsrc/security/tor-browser/patches/patch-modules_pdfium_update.sh \
    pkgsrc/security/tor-browser/patches/patch-servo_components_style_build__gecko.rs \
    pkgsrc/security/tor-browser/patches/patch-toolkit_components_terminator_nsTerminator.cpp \
    pkgsrc/security/tor-browser/patches/patch-toolkit_moz.configure \
    pkgsrc/security/tor-browser/patches/patch-toolkit_mozapps_installer_packager.mk \
    pkgsrc/security/tor-browser/patches/patch-xpcom_build_BinaryPath.h
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/tor-browser/patches/patch-aa \
    pkgsrc/security/tor-browser/patches/patch-image_decoders_nsJPEGDecoder.cpp \
    pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc \
    pkgsrc/security/tor-browser/patches/patch-ipc_glue_GeckoChildProcessHost.cpp \
    pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_cubeb.c \
    pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_cubeb__alsa.c \
    pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_cubeb__oss.c \
    pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_moz.build \
    pkgsrc/security/tor-browser/patches/patch-media_libpng_pngpriv.h \
    pkgsrc/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc \
    pkgsrc/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc \
    pkgsrc/security/tor-browser/patches/patch-toolkit_library_moz.build \
    pkgsrc/security/tor-browser/patches/patch-xpcom_base_nscore.h \
    pkgsrc/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp
cvs rdiff -u -r1.2 -r0 pkgsrc/security/tor-browser/patches/patch-ao \
    pkgsrc/security/tor-browser/patches/patch-as \
    pkgsrc/security/tor-browser/patches/patch-bf \
    pkgsrc/security/tor-browser/patches/patch-browser_installer_package-manifest.in \
    pkgsrc/security/tor-browser/patches/patch-build_autoconf_compiler-opts.m4 \
    pkgsrc/security/tor-browser/patches/patch-build_autoconf_nss.m4 \
    pkgsrc/security/tor-browser/patches/patch-build_gyp.mozbuild \
    pkgsrc/security/tor-browser/patches/patch-build_pgo_profileserver.py \
    pkgsrc/security/tor-browser/patches/patch-config_Makefile.in \
    pkgsrc/security/tor-browser/patches/patch-config_baseconfig.mk \
    pkgsrc/security/tor-browser/patches/patch-config_external_moz.build \
    pkgsrc/security/tor-browser/patches/patch-config_rules.mk \
    pkgsrc/security/tor-browser/patches/patch-config_stl__wrappers_ios \
    pkgsrc/security/tor-browser/patches/patch-config_stl__wrappers_ostream \
    pkgsrc/security/tor-browser/patches/patch-config_system-headers \
    pkgsrc/security/tor-browser/patches/patch-dom_base_moz.build \
    pkgsrc/security/tor-browser/patches/patch-dom_media_gstreamer_GStreamerAllocator.cpp \
    pkgsrc/security/tor-browser/patches/patch-dom_media_moz.build \
    pkgsrc/security/tor-browser/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp \
    pkgsrc/security/tor-browser/patches/patch-dom_plugins_ipc_PluginModuleChild.h \
    pkgsrc/security/tor-browser/patches/patch-dom_plugins_ipc_PluginProcessChild.cpp \
    pkgsrc/security/tor-browser/patches/patch-dom_system_OSFileConstants.cpp \
    pkgsrc/security/tor-browser/patches/patch-gfx_graphite2_src_Bidi.cpp \
    pkgsrc/security/tor-browser/patches/patch-gfx_moz.build \
    pkgsrc/security/tor-browser/patches/patch-gfx_skia_generate__mozbuild.py \
    pkgsrc/security/tor-browser/patches/patch-gfx_skia_moz.build \
    pkgsrc/security/tor-browser/patches/patch-gfx_thebes_moz.build \
    pkgsrc/security/tor-browser/patches/patch-gfx_ycbcr_moz.build \
    pkgsrc/security/tor-browser/patches/patch-gfx_ycbcr_yuv__row__arm.S \
    pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_atomicops.h \
    pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_file__util__posix.cc \
    pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_message__loop.cc \
    pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_platform__thread.h \
    pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_process__util.h \
    pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_process__util__bsd.cc \
    pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_process__util__posix.cc \
    pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_scoped__nsautorelease__pool.h \
    pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_sys__info__posix.cc \
    pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_time__posix.cc \
    pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_build_build__config.h \
    pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_chrome_common_transport__dib.h \
    pkgsrc/security/tor-browser/patches/patch-ipc_glue_StringUtil.cpp \
    pkgsrc/security/tor-browser/patches/patch-ipc_glue_moz.build \
    pkgsrc/security/tor-browser/patches/patch-js__src__vm__SPSProfiler.cpp \
    pkgsrc/security/tor-browser/patches/patch-js_src_ctypes_CTypes.h \
    pkgsrc/security/tor-browser/patches/patch-js_src_frontend_ParseMaps.cpp \
    pkgsrc/security/tor-browser/patches/patch-js_src_jit-LIR.cpp \
    pkgsrc/security/tor-browser/patches/patch-js_src_jit_MIR.cpp \
    pkgsrc/security/tor-browser/patches/patch-js_src_jit_arm_Architecture-arm.cpp \
    pkgsrc/security/tor-browser/patches/patch-js_src_jsdate.cpp \
    pkgsrc/security/tor-browser/patches/patch-js_src_jskwgen.cpp \
    pkgsrc/security/tor-browser/patches/patch-js_src_jsmath.cpp \
    pkgsrc/security/tor-browser/patches/patch-js_src_shell_jsoptparse.cpp \
    pkgsrc/security/tor-browser/patches/patch-js_xpconnect_src_XPCConvert.cpp \
    pkgsrc/security/tor-browser/patches/patch-js_xpconnect_src_xpcprivate.h \
    pkgsrc/security/tor-browser/patches/patch-media_libsoundtouch_src_cpu__detect__x86.cpp \
    pkgsrc/security/tor-browser/patches/patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp \
    pkgsrc/security/tor-browser/patches/patch-media_libstagefright_system_core_liblog_fake__log__device.c \
    pkgsrc/security/tor-browser/patches/patch-media_libstagefright_system_core_liblog_logprint.c \
    pkgsrc/security/tor-browser/patches/patch-media_libtheora_lib_arm_armcpu.c \
    pkgsrc/security/tor-browser/patches/patch-media_libtheora_lib_info.c \
    pkgsrc/security/tor-browser/patches/patch-media_libtheora_moz.build \
    pkgsrc/security/tor-browser/patches/patch-media_libtremor_Makefile.in \
    pkgsrc/security/tor-browser/patches/patch-media_libtremor_moz.build \
    pkgsrc/security/tor-browser/patches/patch-media_libvorbis_Makefile.in \
    pkgsrc/security/tor-browser/patches/patch-media_libvorbis_lib_vorbis_info.c \
    pkgsrc/security/tor-browser/patches/patch-media_libvorbis_moz.build \
    pkgsrc/security/tor-browser/patches/patch-media_libyuv_include_libyuv_scale__row.h \
    pkgsrc/security/tor-browser/patches/patch-media_mtransport_third__party_nICEr_src_util_mbslen.c \
    pkgsrc/security/tor-browser/patches/patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h \
    pkgsrc/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_build_common.gypi \
    pkgsrc/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_audio__coding_neteq_neteq.gypi \
    pkgsrc/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.cc \
    pkgsrc/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.h \
    pkgsrc/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi \
    pkgsrc/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp \
    pkgsrc/security/tor-browser/patches/patch-memory_build_mozjemalloc__compat.c \
    pkgsrc/security/tor-browser/patches/patch-memory_mozalloc_mozalloc__abort.cpp \
    pkgsrc/security/tor-browser/patches/patch-memory_volatile_VolatileBufferOSX.cpp \
    pkgsrc/security/tor-browser/patches/patch-mfbt_Attributes.h \
    pkgsrc/security/tor-browser/patches/patch-mfbt_Poison.cpp \
    pkgsrc/security/tor-browser/patches/patch-modules_libjar_nsZipArchive.cpp \
    pkgsrc/security/tor-browser/patches/patch-netwerk_dns_moz.build \
    pkgsrc/security/tor-browser/patches/patch-netwerk_protocol_http_Http2Session.cpp \
    pkgsrc/security/tor-browser/patches/patch-pb \
    pkgsrc/security/tor-browser/patches/patch-pc \
    pkgsrc/security/tor-browser/patches/patch-rc \
    pkgsrc/security/tor-browser/patches/patch-toolkit_xre_nsAppRunner.cpp \
    pkgsrc/security/tor-browser/patches/patch-toolkit_xre_nsEmbedFunctions.cpp \
    pkgsrc/security/tor-browser/patches/patch-webapprt_moz.build \
    pkgsrc/security/tor-browser/patches/patch-xpcom_build_PoisonIOInterposer.h \
    pkgsrc/security/tor-browser/patches/patch-xpcom_components_Module.h \
    pkgsrc/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_Makefile.in \
    pkgsrc/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build \
    pkgsrc/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp \
    pkgsrc/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S \
    pkgsrc/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s \
    pkgsrc/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp \
    pkgsrc/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp \
    pkgsrc/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp \
    pkgsrc/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp \
    pkgsrc/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S \
    pkgsrc/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s \
    pkgsrc/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp \
    pkgsrc/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp \
    pkgsrc/security/tor-browser/patches/patch-xulrunner_installer_Makefile.in
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/security/tor-browser/patches/patch-config_system__wrappers_unwind.h \
    pkgsrc/security/tor-browser/patches/patch-dom_base_DOMRequest.cpp \
    pkgsrc/security/tor-browser/patches/patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp \
    pkgsrc/security/tor-browser/patches/patch-gfx_cairo_libpixman_src_pixman-arm-neon-asm.S \
    pkgsrc/security/tor-browser/patches/patch-gfx_gl_GLContextProviderGLX.cpp \
    pkgsrc/security/tor-browser/patches/patch-gfx_skia_skia_src_core_SkUtilsArm.cpp \
    pkgsrc/security/tor-browser/patches/patch-gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp \
    pkgsrc/security/tor-browser/patches/patch-gfx_skia_skia_src_opts_memset.arm.S \
    pkgsrc/security/tor-browser/patches/patch-intl_hyphenation_glue_hnjalloc.h \
    pkgsrc/security/tor-browser/patches/patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h \
    pkgsrc/security/tor-browser/patches/patch-media_openmax__dl_dl_api_armCOMM__s.h \
    pkgsrc/security/tor-browser/patches/patch-media_webrtc_signaling_test_common.build \
    pkgsrc/security/tor-browser/patches/patch-modules_libpref_init_all.js \
    pkgsrc/security/tor-browser/patches/patch-mozglue_build_arm.cpp \
    pkgsrc/security/tor-browser/patches/patch-mozglue_build_arm.h \
    pkgsrc/security/tor-browser/patches/patch-storage_SQLiteMutex.h \
    pkgsrc/security/tor-browser/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h \
    pkgsrc/security/tor-browser/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc \
    pkgsrc/security/tor-browser/patches/patch-toolkit_xre_glxtest.cpp \
    pkgsrc/security/tor-browser/patches/patch-xpcom_io_TorFileUtils.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/tor-browser/Makefile
diff -u pkgsrc/security/tor-browser/Makefile:1.36 pkgsrc/security/tor-browser/Makefile:1.37
--- pkgsrc/security/tor-browser/Makefile:1.36   Sat Feb 23 18:58:48 2019
+++ pkgsrc/security/tor-browser/Makefile        Mon Feb 25 15:32:23 2019
@@ -1,30 +1,40 @@
-# $NetBSD: Makefile,v 1.36 2019/02/23 18:58:48 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2019/02/25 15:32:23 wiz Exp $
 
-TORBVER=       6.0.8
-
-DISTNAME=      v6.0.8-esr45.6.0
-PKGNAME=       tor-browser-${TORBVER}
-PKGREVISION=   19
+DISTNAME=      tor-browser-60.5.1esr-8.5-1-build2
+PKGNAME=       tor-browser-8.5
 CATEGORIES=    www
-# Use OpenBSD distfile
-#MASTER_SITES= ${MASTER_SITE_OPENBSD:=distfiles/tor-browser/}
+# DISTFILE manually packaged from git checkout
 
 MAINTAINER=    ryoon%NetBSD.org@localhost
 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-/}
+WRKSRC=                ${WRKDIR}/tor-browser
 
 DEPENDS+=      tor-[0-9]*:../../net/tor
 
+# How to update this package:
+#
+# make a tarball:
+# git clone https://git.torproject.org/tor-browser.git
+# cd tor-browser
+# git fetch --tags
+# git tag -l
+# (choose a tag, here tor-browser-60.5.1esr-8.5-1-build2)
+# git checkout tor-browser-60.5.1esr-8.5-1-build2
+# cd ..
+# tar -cvzf tor-browser-60.5.1esr-8.5-1-build2.tar.gz --exclude .git tor-browser
+#
+# replace all patches with the one from the correspoding www/firefox${ESR_RELEASE}
+# BUT keep patch-xpcom_io_TorFileUtils.cpp!
+# make the patches apply
+#
+# when packaged up, read MESSAGE and test by visiting https://check.torproject.org
+
 # Remove hardcoded build directory.
 SUBST_CLASSES+=                        fix-build-dir
-SUBST_STAGE.fix-build-dir+=    pre-configure
+SUBST_STAGE.fix-build-dir=     pre-configure
 SUBST_FILES.fix-build-dir+=    .mozconfig
 SUBST_SED.fix-build-dir+=      -e 's,mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@,,'
 
@@ -32,17 +42,7 @@ MOZILLA_DIR= # empty
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS+=       --enable-application=browser
-CONFIGURE_ARGS+=       --disable-tor-browser-update
-CONFIGURE_ARGS+=       --disable-webrtc
-CONFIGURE_ARGS+=       --disable-gio
-CONFIGURE_ARGS+=       --disable-dbus
-CONFIGURE_ARGS+=       --disable-gnomeui
-CONFIGURE_ARGS+=        --disable-libnotify
-.if ${OPSYS} != "SunOS"
-CONFIGURE_ARGS+=        --enable-pie
-.endif
-CONFIGURE_ARGS+=        --enable-tor-data-in-home-dir
+CONFIGURE_ARGS+=       --enable-tor-browser-data-outside-app-dir
 CFLAGS+=               -DTOR_BROWSER_DATA_IN_HOME_DIR=1
 CFLAGS+=               -DTOR_BROWSER_DATA_OUTSIDE_APP_DIR=1
 CFLAGS+=               -fPIC
@@ -51,23 +51,23 @@ CFLAGS+=            -fPIC
 CFLAGS+=       -fpermissive
 
 # workaround for link of libxul.so etc.
-LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/tor-browser ${COMPILER_RPATH_FLAG}${PREFIX}/lib
+LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE}
+LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib
+LDFLAGS.DragonFly+=    -lplc4 -lnspr4
+LDFLAGS.FreeBSD+=      -lplc4 -lnspr4
+LDFLAGS.Linux+=                -lnspr4
 LDFLAGS.SunOS+=                -lm
 
-ALL_ENV+=              MOZILLA_PKG_NAME=tor-browser
+ALL_ENV+=              MOZ_APP_NAME=${PKGBASE}
 
-NOT_PAX_MPROTECT_SAFE+=        lib/tor-browser/firefox
-NOT_PAX_MPROTECT_SAFE+=        lib/tor-browser/firefox-bin
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/tor-browser
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/tor-browser-bin
 
 # Avoid ld "invalid section index" errors.
 BUILDLINK_TRANSFORM.SunOS+=    rm:-fdata-sections
 BUILDLINK_TRANSFORM.SunOS+=    rm:-ffunction-sections
 
-LDFLAGS.DragonFly=     -lplc4 -lnspr4
-LDFLAGS.FreeBSD=       -lplc4 -lnspr4
-LDFLAGS.Linux=         -lnspr4
-
-.include "../../www/firefox45/mozilla-common.mk"
+.include "../../www/firefox60/mozilla-common.mk"
 .include "options.mk"
 
 CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py
@@ -75,15 +75,11 @@ CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/
 CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py
 CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py
 
-MOZILLA=       tor-browser
-MOZILLA_ICON=  ${WRKSRC}/${OBJDIR}/dist/firefox/browser/chrome/icons/default/default48.png
-MOZILLA_NAME=  TorBrowser
+CHECK_WRKREF_SKIP+=    lib/${PKGBASE}/chrome/toolkit/content/global/buildconfig.html
 
-SUBST_CLASSES+=                sys-dic
-SUBST_STAGE.sys-dic=   pre-configure
-SUBST_MESSAGE.sys-dic= Reference to system hunspell dictionaries.
-SUBST_FILES.sys-dic=   extensions/spellcheck/hunspell/src/mozHunspell.cpp
-SUBST_VARS.sys-dic=    PREFIX
+MOZILLA=       ${PKGBASE}
+MOZILLA_ICON=  ${WRKSRC}/browser/branding/official/default48.png
+MOZILLA_NAME=  TorBrowser
 
 post-extract:
        mv ${WRKSRC}/gfx/ycbcr/yuv_row_arm.s ${WRKSRC}/gfx/ycbcr/yuv_row_arm.S
@@ -91,6 +87,7 @@ post-extract:
 pre-configure:
        cd ${WRKSRC} && mkdir ${OBJDIR}
        cd ${WRKSRC} && autoconf
+       cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars
        cd ${WRKSRC}/js/src && autoconf
 
 post-build:
@@ -102,10 +99,15 @@ post-build:
 
 INSTALLATION_DIRS+=    share/applications share/pixmaps
 post-install:
+       ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA}
+       ${ECHO} '${PREFIX}/lib/tor-browser/tor-browser-bin "$$@"' >> \
+               ${DESTDIR}${PREFIX}/bin/${MOZILLA}
+       ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/${MOZILLA}
        ${INSTALL_DATA} ${WRKDIR}/desktop                               \
          ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
        ${INSTALL_DATA} ${MOZILLA_ICON}                                 \
          ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/tor-browser/PLIST
diff -u pkgsrc/security/tor-browser/PLIST:1.2 pkgsrc/security/tor-browser/PLIST:1.3
--- pkgsrc/security/tor-browser/PLIST:1.2       Sun Jan 22 12:27:21 2017
+++ pkgsrc/security/tor-browser/PLIST   Mon Feb 25 15:32:23 2019
@@ -1,20 +1,22 @@
-@comment $NetBSD: PLIST,v 1.2 2017/01/22 12:27:21 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/02/25 15:32:23 wiz Exp $
 bin/tor-browser
 lib/tor-browser/application.ini
 lib/tor-browser/browser/blocklist.xml
 lib/tor-browser/browser/chrome.manifest
 lib/tor-browser/browser/chrome/browser/content/branding/about-logo.png
 lib/tor-browser/browser/chrome/browser/content/branding/about-logo%2x.png@localhost
-lib/tor-browser/browser/chrome/browser/content/branding/about-wordmark.png
+lib/tor-browser/browser/chrome/browser/content/branding/about-wordmark.svg
 lib/tor-browser/browser/chrome/browser/content/branding/about.png
 lib/tor-browser/browser/chrome/browser/content/branding/aboutDialog.css
 lib/tor-browser/browser/chrome/browser/content/branding/icon128.png
 lib/tor-browser/browser/chrome/browser/content/branding/icon16.png
+lib/tor-browser/browser/chrome/browser/content/branding/icon256.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/icon512.png
 lib/tor-browser/browser/chrome/browser/content/branding/icon64.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/briefcase.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
@@ -23,30 +25,17 @@ lib/tor-browser/browser/chrome/browser/c
 lib/tor-browser/browser/chrome/browser/content/browser/aboutPrivateBrowsing.css
 lib/tor-browser/browser/chrome/browser/content/browser/aboutPrivateBrowsing.js
 lib/tor-browser/browser/chrome/browser/content/browser/aboutPrivateBrowsing.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/aboutProviderDirectory.xhtml
 lib/tor-browser/browser/chrome/browser/content/browser/aboutRobots-icon.png
 lib/tor-browser/browser/chrome/browser/content/browser/aboutRobots-widget-left.png
+lib/tor-browser/browser/chrome/browser/content/browser/aboutRobots.css
+lib/tor-browser/browser/chrome/browser/content/browser/aboutRobots.js
 lib/tor-browser/browser/chrome/browser/content/browser/aboutRobots.xhtml
 lib/tor-browser/browser/chrome/browser/content/browser/aboutSessionRestore.js
 lib/tor-browser/browser/chrome/browser/content/browser/aboutSessionRestore.xhtml
-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
-lib/tor-browser/browser/chrome/browser/content/browser/aboutaccounts/aboutaccounts.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/aboutaccounts/images/fox.png
-lib/tor-browser/browser/chrome/browser/content/browser/aboutaccounts/images/graphic_sync_intro.png
-lib/tor-browser/browser/chrome/browser/content/browser/aboutaccounts/images/graphic_sync_intro%2x.png@localhost
-lib/tor-browser/browser/chrome/browser/content/browser/aboutaccounts/main.css
-lib/tor-browser/browser/chrome/browser/content/browser/aboutaccounts/normalize.css
-lib/tor-browser/browser/chrome/browser/content/browser/abouthealthreport/abouthealth.css
-lib/tor-browser/browser/chrome/browser/content/browser/abouthealthreport/abouthealth.js
-lib/tor-browser/browser/chrome/browser/content/browser/abouthealthreport/abouthealth.xhtml
 lib/tor-browser/browser/chrome/browser/content/browser/abouthome/aboutHome.css
 lib/tor-browser/browser/chrome/browser/content/browser/abouthome/aboutHome.js
 lib/tor-browser/browser/chrome/browser/content/browser/abouthome/aboutHome.xhtml
@@ -58,8 +47,6 @@ lib/tor-browser/browser/chrome/browser/c
 lib/tor-browser/browser/chrome/browser/content/browser/abouthome/downloads%2x.png@localhost
 lib/tor-browser/browser/chrome/browser/content/browser/abouthome/history.png
 lib/tor-browser/browser/chrome/browser/content/browser/abouthome/history%2x.png@localhost
-lib/tor-browser/browser/chrome/browser/content/browser/abouthome/mozilla.png
-lib/tor-browser/browser/chrome/browser/content/browser/abouthome/mozilla%2x.png@localhost
 lib/tor-browser/browser/chrome/browser/content/browser/abouthome/restore-large.png
 lib/tor-browser/browser/chrome/browser/content/browser/abouthome/restore-large%2x.png@localhost
 lib/tor-browser/browser/chrome/browser/content/browser/abouthome/restore.png
@@ -72,112 +59,118 @@ lib/tor-browser/browser/chrome/browser/c
 lib/tor-browser/browser/chrome/browser/content/browser/abouthome/snippet2%2x.png@localhost
 lib/tor-browser/browser/chrome/browser/content/browser/abouthome/sync.png
 lib/tor-browser/browser/chrome/browser/content/browser/abouthome/sync%2x.png@localhost
-lib/tor-browser/browser/chrome/browser/content/browser/baseMenuOverlay.xul
 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-captivePortal.js
+lib/tor-browser/browser/chrome/browser/content/browser/browser-compacttheme.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-fullScreenAndPointerLock.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-media.js
+lib/tor-browser/browser/chrome/browser/content/browser/browser-pageActions.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-sync.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-webrender.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
-lib/tor-browser/browser/chrome/browser/content/browser/certerror/aboutCertError.css
-lib/tor-browser/browser/chrome/browser/content/browser/certerror/aboutCertError.xhtml
-lib/tor-browser/browser/chrome/browser/content/browser/chatWindow.xul
+lib/tor-browser/browser/chrome/browser/content/browser/built_in_addons.json
 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
-lib/tor-browser/browser/chrome/browser/content/browser/customizableui/panelUI.xml
 lib/tor-browser/browser/chrome/browser/content/browser/customizableui/toolbar.xml
-lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/1.footer.jpg
+lib/tor-browser/browser/chrome/browser/content/browser/default-theme-icon.svg
 lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/1.header.jpg
 lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/1.icon.jpg
 lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/1.preview.jpg
-lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/2.footer.jpg
 lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/2.header.jpg
 lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/2.icon.jpg
 lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/2.preview.jpg
-lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/3.footer.png
 lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/3.header.png
 lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/3.icon.png
 lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/3.preview.png
-lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/4.footer.png
 lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/4.header.png
 lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/4.icon.png
 lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/4.preview.png
-lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/5.footer.png
 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/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/defaultthemes/dark.icon.svg
+lib/tor-browser/browser/chrome/browser/content/browser/defaultthemes/light.icon.svg
 lib/tor-browser/browser/chrome/browser/content/browser/downloads/allDownloadsViewOverlay.js
 lib/tor-browser/browser/chrome/browser/content/browser/downloads/allDownloadsViewOverlay.xul
 lib/tor-browser/browser/chrome/browser/content/browser/downloads/contentAreaDownloadsView.css
 lib/tor-browser/browser/chrome/browser/content/browser/downloads/contentAreaDownloadsView.js
 lib/tor-browser/browser/chrome/browser/content/browser/downloads/contentAreaDownloadsView.xul
-lib/tor-browser/browser/chrome/browser/content/browser/downloads/download.css
 lib/tor-browser/browser/chrome/browser/content/browser/downloads/download.xml
 lib/tor-browser/browser/chrome/browser/content/browser/downloads/downloads.css
 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/ext-bookmarks.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-browser.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-browser.json
 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-browsingData.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-c-browser.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-c-devtools-inspectedWindow.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-c-devtools-network.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-c-devtools-panels.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-c-devtools.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-c-menus.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-c-omnibox.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-c-tabs.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-chrome-settings-overrides.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-commands.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-devtools-inspectedWindow.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-devtools-network.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-devtools-panels.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-devtools.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-find.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-geckoProfiler.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-history.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-menus.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-omnibox.js
 lib/tor-browser/browser/chrome/browser/content/browser/ext-pageAction.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-pkcs11.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-sessions.js
+lib/tor-browser/browser/chrome/browser/content/browser/ext-sidebarAction.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-url-overrides.js
 lib/tor-browser/browser/chrome/browser/content/browser/ext-windows.js
+lib/tor-browser/browser/chrome/browser/content/browser/extension.css
 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/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/illustrations/error-connection-failure.svg
+lib/tor-browser/browser/chrome/browser/content/browser/illustrations/error-malformed-url.svg
+lib/tor-browser/browser/chrome/browser/content/browser/illustrations/error-server-not-found.svg
 lib/tor-browser/browser/chrome/browser/content/browser/license.html
 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.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
 lib/tor-browser/browser/chrome/browser/content/browser/pageinfo/pageInfo.css
 lib/tor-browser/browser/chrome/browser/content/browser/pageinfo/pageInfo.js
-lib/tor-browser/browser/chrome/browser/content/browser/pageinfo/pageInfo.xml
 lib/tor-browser/browser/chrome/browser/content/browser/pageinfo/pageInfo.xul
 lib/tor-browser/browser/chrome/browser/content/browser/pageinfo/permissions.js
 lib/tor-browser/browser/chrome/browser/content/browser/pageinfo/security.js
@@ -191,8 +184,6 @@ lib/tor-browser/browser/chrome/browser/c
 lib/tor-browser/browser/chrome/browser/content/browser/places/editBookmarkOverlay.xul
 lib/tor-browser/browser/chrome/browser/content/browser/places/history-panel.js
 lib/tor-browser/browser/chrome/browser/content/browser/places/menu.xml
-lib/tor-browser/browser/chrome/browser/content/browser/places/moveBookmarks.js
-lib/tor-browser/browser/chrome/browser/content/browser/places/moveBookmarks.xul
 lib/tor-browser/browser/chrome/browser/content/browser/places/organizer.css
 lib/tor-browser/browser/chrome/browser/content/browser/places/places.css
 lib/tor-browser/browser/chrome/browser/content/browser/places/places.js
@@ -200,72 +191,33 @@ lib/tor-browser/browser/chrome/browser/c
 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/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@localhost
-lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketerror%2x.png@localhost
-lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketlogo%1x.png@localhost
-lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketlogo%2x.png@localhost
-lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketlogosolo%1x.png@localhost
-lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketlogosolo%2x.png@localhost
-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@localhost
-lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketsignup_button%1x.png@localhost
-lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketsignup_button%2x.png@localhost
-lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketsignup_devices%1x.png@localhost
-lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketsignup_devices%2x.png@localhost
-lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketsignup_hero%1x.png@localhost
-lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/pocketsignup_hero%2x.png@localhost
-lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/signup_firefoxlogo%1x.png@localhost
-lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/signup_firefoxlogo%2x.png@localhost
-lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/signup_help%1x.png@localhost
-lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/signup_help%2x.png@localhost
-lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/tag_close%1x.png@localhost
-lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/tag_close%2x.png@localhost
-lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/tag_closeactive%1x.png@localhost
-lib/tor-browser/browser/chrome/browser/content/browser/pocket/panels/img/tag_closeactive%2x.png@localhost
-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/blocklists.js
 lib/tor-browser/browser/chrome/browser/content/browser/preferences/blocklists.xul
+lib/tor-browser/browser/chrome/browser/content/browser/preferences/clearSiteData.css
+lib/tor-browser/browser/chrome/browser/content/browser/preferences/clearSiteData.js
+lib/tor-browser/browser/chrome/browser/content/browser/preferences/clearSiteData.xul
+lib/tor-browser/browser/chrome/browser/content/browser/preferences/colors.js
 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/containers.js
+lib/tor-browser/browser/chrome/browser/content/browser/preferences/containers.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
 lib/tor-browser/browser/chrome/browser/content/browser/preferences/fonts.xul
 lib/tor-browser/browser/chrome/browser/content/browser/preferences/handlers.css
 lib/tor-browser/browser/chrome/browser/content/browser/preferences/handlers.xml
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/in-content/advanced.js
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/in-content/applications.js
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/in-content/content.js
+lib/tor-browser/browser/chrome/browser/content/browser/preferences/in-content/containers.js
+lib/tor-browser/browser/chrome/browser/content/browser/preferences/in-content/extensionControlled.js
+lib/tor-browser/browser/chrome/browser/content/browser/preferences/in-content/findInPage.js
 lib/tor-browser/browser/chrome/browser/content/browser/preferences/in-content/main.js
 lib/tor-browser/browser/chrome/browser/content/browser/preferences/in-content/preferences.js
 lib/tor-browser/browser/chrome/browser/content/browser/preferences/in-content/preferences.xul
 lib/tor-browser/browser/chrome/browser/content/browser/preferences/in-content/privacy.js
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/in-content/search.css
 lib/tor-browser/browser/chrome/browser/content/browser/preferences/in-content/search.js
-lib/tor-browser/browser/chrome/browser/content/browser/preferences/in-content/security.js
 lib/tor-browser/browser/chrome/browser/content/browser/preferences/in-content/subdialogs.js
 lib/tor-browser/browser/chrome/browser/content/browser/preferences/in-content/sync.js
 lib/tor-browser/browser/chrome/browser/content/browser/preferences/languages.js
@@ -276,73 +228,85 @@ lib/tor-browser/browser/chrome/browser/c
 lib/tor-browser/browser/chrome/browser/content/browser/preferences/sanitize.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/siteDataRemoveSelected.js
+lib/tor-browser/browser/chrome/browser/content/browser/preferences/siteDataRemoveSelected.xul
+lib/tor-browser/browser/chrome/browser/content/browser/preferences/siteDataSettings.js
+lib/tor-browser/browser/chrome/browser/content/browser/preferences/siteDataSettings.xul
+lib/tor-browser/browser/chrome/browser/content/browser/preferences/sitePermissions.css
+lib/tor-browser/browser/chrome/browser/content/browser/preferences/sitePermissions.js
+lib/tor-browser/browser/chrome/browser/content/browser/preferences/sitePermissions.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/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/robot.ico
 lib/tor-browser/browser/chrome/browser/content/browser/safeMode.css
 lib/tor-browser/browser/chrome/browser/content/browser/safeMode.js
 lib/tor-browser/browser/chrome/browser/content/browser/safeMode.xul
-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/schemas/bookmarks.json
+lib/tor-browser/browser/chrome/browser/content/browser/schemas/browser_action.json
+lib/tor-browser/browser/chrome/browser/content/browser/schemas/browsing_data.json
+lib/tor-browser/browser/chrome/browser/content/browser/schemas/chrome_settings_overrides.json
+lib/tor-browser/browser/chrome/browser/content/browser/schemas/commands.json
+lib/tor-browser/browser/chrome/browser/content/browser/schemas/devtools.json
+lib/tor-browser/browser/chrome/browser/content/browser/schemas/devtools_inspected_window.json
+lib/tor-browser/browser/chrome/browser/content/browser/schemas/devtools_network.json
+lib/tor-browser/browser/chrome/browser/content/browser/schemas/devtools_panels.json
+lib/tor-browser/browser/chrome/browser/content/browser/schemas/find.json
+lib/tor-browser/browser/chrome/browser/content/browser/schemas/geckoProfiler.json
+lib/tor-browser/browser/chrome/browser/content/browser/schemas/history.json
+lib/tor-browser/browser/chrome/browser/content/browser/schemas/menus.json
+lib/tor-browser/browser/chrome/browser/content/browser/schemas/menus_internal.json
+lib/tor-browser/browser/chrome/browser/content/browser/schemas/omnibox.json
+lib/tor-browser/browser/chrome/browser/content/browser/schemas/page_action.json
+lib/tor-browser/browser/chrome/browser/content/browser/schemas/pkcs11.json
+lib/tor-browser/browser/chrome/browser/content/browser/schemas/sessions.json
+lib/tor-browser/browser/chrome/browser/content/browser/schemas/sidebar_action.json
 lib/tor-browser/browser/chrome/browser/content/browser/schemas/tabs.json
+lib/tor-browser/browser/chrome/browser/content/browser/schemas/url_overrides.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/searchReset.js
+lib/tor-browser/browser/chrome/browser/content/browser/search/searchReset.xhtml
 lib/tor-browser/browser/chrome/browser/content/browser/search/searchbarBindings.css
 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
-lib/tor-browser/browser/chrome/browser/content/browser/sync/aboutSyncTabs.css
-lib/tor-browser/browser/chrome/browser/content/browser/sync/aboutSyncTabs.js
-lib/tor-browser/browser/chrome/browser/content/browser/sync/aboutSyncTabs.xul
-lib/tor-browser/browser/chrome/browser/content/browser/sync/addDevice.js
-lib/tor-browser/browser/chrome/browser/content/browser/sync/addDevice.xul
-lib/tor-browser/browser/chrome/browser/content/browser/sync/customize.css
-lib/tor-browser/browser/chrome/browser/content/browser/sync/customize.js
-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/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/static-robot.png
+lib/tor-browser/browser/chrome/browser/content/browser/syncedtabs/sidebar.js
+lib/tor-browser/browser/chrome/browser/content/browser/syncedtabs/sidebar.xhtml
 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.js
 lib/tor-browser/browser/chrome/browser/content/browser/tabbrowser.xml
 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/usercontext/usercontext.css
 lib/tor-browser/browser/chrome/browser/content/browser/utilityOverlay.js
-lib/tor-browser/browser/chrome/browser/content/browser/viewSourceOverlay.xul
 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/webext-panels.js
+lib/tor-browser/browser/chrome/browser/content/browser/webext-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/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/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/content/cart.svg
+lib/tor-browser/browser/chrome/browser/content/chill.svg
+lib/tor-browser/browser/chrome/browser/content/circle.svg
+lib/tor-browser/browser/chrome/browser/content/dollar.svg
+lib/tor-browser/browser/chrome/browser/content/fingerprint.svg
+lib/tor-browser/browser/chrome/browser/content/food.svg
+lib/tor-browser/browser/chrome/browser/content/fruit.svg
+lib/tor-browser/browser/chrome/browser/content/gift.svg
+lib/tor-browser/browser/chrome/browser/content/pet.svg
+lib/tor-browser/browser/chrome/browser/content/tree.svg
+lib/tor-browser/browser/chrome/browser/content/vacation.svg
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/aboutNetError.css
-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
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/aboutSocialError.css
-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/addons/addon-install-anchor.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/accessibility-active.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/accessibility.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
@@ -350,274 +314,275 @@ lib/tor-browser/browser/chrome/browser/s
 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@localhost
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/browser-lightweightTheme.css
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/arrow-left.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/back-12.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/back.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/blockedSite.css
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/bookmark-animation.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/bookmark-hollow.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/bookmark-star-on-tray.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/bookmark.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/bookmarks-toolbar.svg
 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/characterEncoding.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/check-animation.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/check.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/chevron-animation.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/chevron.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/compacttheme.css
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/connection-mixed-active-loaded.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/connection-mixed-passive-loaded.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/connection-secure.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/connection.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/controlcenter/extension.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@localhost
-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@localhost
-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@localhost
-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@localhost
-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@localhost
-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@localhost
-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/subView-arrow-back-inverted%2x.png@localhost
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/density-compact.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/density-normal.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/density-touch.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/empty-overflow-panel.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/empty-overflow-panel%2x.png@localhost
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/customizableui/panelUI.css
 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@localhost
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devedition.css
-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@localhost
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devedition/urlbar-history-dropmarker.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/devtools/common.css
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/customize.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/developer.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/device-desktop.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/device-mobile.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/device-tablet.svg
 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
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/downloads/download-glow-menuPanel.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/downloads/download-notification-finish.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/downloads/download-notification-start.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/downloads/download-summary.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/downloads/download-blocked.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/downloads/download-icons.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/downloads/download-summary.svg
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/downloads/downloads.css
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/downloads/notification-start-animation.svg
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/drm-icon.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/e10s-64%2x.png@localhost
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/edit-copy.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/edit-cut.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/edit-paste.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/error-pages.css
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/favicon-search-16.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/feed.svg
 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/folder.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/forget.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/forward.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/fullscreen-exit.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/fullscreen.svg
 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@localhost
-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@localhost
-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@localhost
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/fxa/sync-illustration.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/fxa/default-avatar.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/fxa/sync-illustration-issue.svg
 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@localhost
-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/history.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/home.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/icon-search-64.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/identity-icon-notice.svg
 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/illustrations/error-session-restore.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@localhost
-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@localhost
-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@localhost
-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@localhost
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/menuPanel.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/menuPanel%2x.png@localhost
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/library-bookmark-animation.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/library.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/link.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/mail.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/menu-badged.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/menu.svg
 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/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@localhost
-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@localhost
-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@localhost
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/new-tab.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/new-window.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/camera-blocked.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/camera.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/canvas-blocked.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/canvas.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/default-info.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/desktop-notification-blocked.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/desktop-notification.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/focus-tab-by-prompt.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/geo-blocked.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/geo-detailed.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/geo.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/indexedDB.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/login-detailed.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/login.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/microphone-blocked.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/microphone-detailed.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/microphone.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/midi.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/persistent-storage-blocked.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/persistent-storage.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/plugin-badge.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/popup-subitem.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/popup.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/screen-blocked.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/screen.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/update.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/notification-icons/webauthn.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/onion-disabled.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/onion-lock.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/onion.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/open.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/page-action.svg
 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@localhost
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/panel-icon-arrow-left.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/panel-icon-arrow-right.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/panel-icon-cancel.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/panel-icon-folder.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/panel-icon-retry.svg
 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@localhost
 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@localhost
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/autocomplete-star.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/allBookmarks.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/bookmarks-notification-finish%2x.png@localhost
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/bookmarksMenu.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/bookmarksToolbar-menuPanel.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/bookmarksMenu.svg
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/bookmarksToolbar.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/calendar.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/bookmarksToolbar.svg
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/downloads.png
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/editBookmarkOverlay.css
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/folder-live.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/folder-smart.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/folder.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/history.svg
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/livemark-item.png
 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/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
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/unfiledBookmarks.svg
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/unsortedBookmarks.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/places/unstarred48.png
-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/alwaysAsk.png
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/applications.css
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/containers.css
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/containers.css
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/critters-postcard.jpg
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/dialog.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/favicon.ico
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/icons.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/face-sad.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/face-smile.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/fxa-avatar.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/general.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/logo-android.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/logo-ios.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/no-search-bar.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/no-search-results.svg
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/preferences.css
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/privacy-security.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/privacy.css
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/search-arrow-indicator.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/search-bar.svg
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/search.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/mail.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/search.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/siteDataSettings.css
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/sync-devices.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/preferences/in-content/sync.svg
 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@localhost
-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@localhost
-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@localhost
-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@localhost
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/print.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/private-browsing.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/privateBrowsing.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/privatebrowsing/aboutPrivateBrowsing.css
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/privatebrowsing/favicon.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/privatebrowsing/private-browsing.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/privatebrowsing/tracking-protection-off.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/privatebrowsing/tracking-protection.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/quit.svg
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/readerMode.svg
-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@localhost
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/reload-to-stop.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/reload.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/restore-session.svg
 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/save.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@localhost
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/search-history-icon.svg
-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@localhost
-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@localhost
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/search-pref.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/search-glass.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/search-indicator-badge-add.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/searchReset.css
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/searchbar.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/session-restore.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/send-to-device.svg
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/setDesktopBackground.css
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/settings.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/sidebars-right.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/sidebars.svg
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/slowStartup-16.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/social/chat-icons.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/social/gear_clicked.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/social/gear_default.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/social/services-16.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/social/services-64.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/social/share-button-active.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/social/share-button.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/sync-128.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/sync-16.png
-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@localhost
-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@localhost
-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@localhost
-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/syncQuota.css
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/syncSetup.css
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/stop-to-reload.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/stop.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/sync-desktopIcon.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/sync-mobileIcon.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/sync.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/syncedtabs/sidebar.css
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/tab-crashed.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/alltabs-inverted.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/alltabs.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/connecting.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/tab.svg
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/crashed.svg
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/loading.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/indicator-tab-attention.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/loading-burst.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/loading.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/newtab.svg
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/pendingpaint.png
-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-blocked.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-audio-muted.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-audio-playing.svg
 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-connecting.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-connecting%2x.png@localhost
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-loading-inverted.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-loading-inverted%2x.png@localhost
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-loading.png
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-loading%2x.png@localhost
 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-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/theme-switcher-icon.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/theme-switcher-icon%2x.png@localhost
 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@localhost
 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@localhost
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/undoCloseTab.png
-lib/tor-browser/browser/chrome/browser/skin/classic/browser/undoCloseTab%2x.png@localhost
 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/urlbar-arrow%2x.png@localhost
-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-white.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/webIDE.svg
 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@localhost
-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@localhost
-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@localhost
-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@localhost
-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@localhost
-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@localhost
-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@localhost
-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@localhost
-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@localhost
 lib/tor-browser/browser/chrome/browser/skin/classic/browser/welcome-back.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/wifi.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/window.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/zoom-in.svg
+lib/tor-browser/browser/chrome/browser/skin/classic/browser/zoom-out.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-shim/content/DevToolsShim.jsm
+lib/tor-browser/browser/chrome/devtools-shim/content/aboutdevtools/aboutdevtools.css
+lib/tor-browser/browser/chrome/devtools-shim/content/aboutdevtools/aboutdevtools.js
+lib/tor-browser/browser/chrome/devtools-shim/content/aboutdevtools/aboutdevtools.xhtml
+lib/tor-browser/browser/chrome/devtools-shim/content/aboutdevtools/images/dev-edition-logo.svg
+lib/tor-browser/browser/chrome/devtools-shim/content/aboutdevtools/images/external-link.svg
+lib/tor-browser/browser/chrome/devtools-shim/content/aboutdevtools/images/feature-console.svg
+lib/tor-browser/browser/chrome/devtools-shim/content/aboutdevtools/images/feature-debugger.svg
+lib/tor-browser/browser/chrome/devtools-shim/content/aboutdevtools/images/feature-inspector.svg
+lib/tor-browser/browser/chrome/devtools-shim/content/aboutdevtools/images/feature-memory.svg
+lib/tor-browser/browser/chrome/devtools-shim/content/aboutdevtools/images/feature-network.svg
+lib/tor-browser/browser/chrome/devtools-shim/content/aboutdevtools/images/feature-performance.svg
+lib/tor-browser/browser/chrome/devtools-shim/content/aboutdevtools/images/feature-responsive.svg
+lib/tor-browser/browser/chrome/devtools-shim/content/aboutdevtools/images/feature-storage.svg
+lib/tor-browser/browser/chrome/devtools-shim/content/aboutdevtools/images/feature-visualediting.svg
+lib/tor-browser/browser/chrome/devtools-shim/content/aboutdevtools/images/otter.svg
+lib/tor-browser/browser/chrome/devtools-shim/content/aboutdevtools/subscribe.css
+lib/tor-browser/browser/chrome/devtools-shim/content/aboutdevtools/subscribe.js
 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/aboutdebugging/initializer.js
 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
@@ -625,13 +590,13 @@ lib/tor-browser/browser/chrome/devtools/
 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/new/index.html
 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
@@ -642,12 +607,8 @@ lib/tor-browser/browser/chrome/devtools/
 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/dom/dom.html
+lib/tor-browser/browser/chrome/devtools/content/dom/main.js
 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
@@ -655,24 +616,32 @@ lib/tor-browser/browser/chrome/devtools/
 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-init.js
+lib/tor-browser/browser/chrome/devtools/content/framework/toolbox-options.xhtml
 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/inspector/inspector.js
+lib/tor-browser/browser/chrome/devtools/content/inspector/inspector.xhtml
+lib/tor-browser/browser/chrome/devtools/content/inspector/markup/markup.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/netmonitor/index.html
+lib/tor-browser/browser/chrome/devtools/content/netmonitor/initializer.js
+lib/tor-browser/browser/chrome/devtools/content/netmonitor/src/assets/icons/play.svg
+lib/tor-browser/browser/chrome/devtools/content/netmonitor/src/assets/styles/MdnLink.css
+lib/tor-browser/browser/chrome/devtools/content/netmonitor/src/assets/styles/NetworkDetailsPanel.css
+lib/tor-browser/browser/chrome/devtools/content/netmonitor/src/assets/styles/RequestList.css
+lib/tor-browser/browser/chrome/devtools/content/netmonitor/src/assets/styles/StatisticsPanel.css
+lib/tor-browser/browser/chrome/devtools/content/netmonitor/src/assets/styles/StatusBar.css
+lib/tor-browser/browser/chrome/devtools/content/netmonitor/src/assets/styles/Toolbar.css
+lib/tor-browser/browser/chrome/devtools/content/netmonitor/src/assets/styles/httpi.css
+lib/tor-browser/browser/chrome/devtools/content/netmonitor/src/assets/styles/netmonitor.css
+lib/tor-browser/browser/chrome/devtools/content/netmonitor/src/assets/styles/variables.css
+lib/tor-browser/browser/chrome/devtools/content/performance-new/frame-script.js
+lib/tor-browser/browser/chrome/devtools/content/performance-new/initializer.js
+lib/tor-browser/browser/chrome/devtools/content/performance-new/perf.xhtml
 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
@@ -683,71 +652,36 @@ lib/tor-browser/browser/chrome/devtools/
 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/responsive.html/index.js
+lib/tor-browser/browser/chrome/devtools/content/responsive.html/index.xhtml
 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/color-widget.css
 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/addon/dialog/dialog.css
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/addon/hint/show-hint.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/addon/tern/tern.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/cmiframe.html
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/codemirror.bundle.js
+lib/tor-browser/browser/chrome/devtools/content/sourceeditor/codemirror/lib/codemirror.css
 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/sourceeditor/codemirror/old-debugger.css
 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
@@ -757,15 +691,34 @@ lib/tor-browser/browser/chrome/devtools/
 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/browserconsole.xul
+lib/tor-browser/browser/chrome/devtools/content/webconsole/webconsole.html
 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/aboutdebugging/components/Aboutdebugging.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/PanelHeader.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/PanelMenu.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/PanelMenuEntry.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/TargetList.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons/Controls.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons/InstallError.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons/Panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons/Target.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/tabs/Panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/tabs/Target.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers/MultiE10sWarning.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers/Panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers/ServiceWorkerTarget.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers/Target.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/aboutdebugging/modules/addon.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/aboutdebugging/modules/connect.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/aboutdebugging/modules/worker.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/animationinspector/components/animation-details.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/animationinspector/components/animation-target-node.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/animationinspector/components/animation-time-block.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/animationinspector/components/animation-timeline.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/animationinspector/components/keyframes.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/animationinspector/components/rate-selector.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/animationinspector/graph-helper.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
@@ -783,179 +736,529 @@ lib/tor-browser/browser/chrome/devtools/
 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/new/debugger.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/debugger/new/debugger.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/debugger/new/panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/debugger/new/parser-worker.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/debugger/new/pretty-print-worker.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/debugger/new/search-worker.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/dom/content/actions/filter.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/dom/content/actions/grips.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/dom/content/components/dom-tree.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/dom/content/components/main-frame.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/dom/content/components/main-toolbar.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/dom/content/constants.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/dom/content/dom-decorator.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/dom/content/dom-view.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/dom/content/dom-view.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/dom/content/grip-provider.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/dom/content/reducers/filter.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/dom/content/reducers/grips.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/dom/content/reducers/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/dom/content/utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/dom/dom-panel.js
 lib/tor-browser/browser/chrome/devtools/modules/devtools/client/framework/ToolboxProcess.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/framework/attach-thread.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/framework/browser-menus.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/framework/components/toolbox-controller.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/framework/components/toolbox-tab.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/framework/components/toolbox-tabs.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/framework/components/toolbox-toolbar.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/framework/devtools-browser.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/framework/devtools.js
 lib/tor-browser/browser/chrome/devtools/modules/devtools/client/framework/gDevTools.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/framework/menu-item.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/framework/menu.js
 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/source-map-url-service.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/framework/target-from-url.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-host-manager.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/animation/actions/animations.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/actions/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/animation.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimatedPropertyItem.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimatedPropertyList.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimatedPropertyListContainer.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimatedPropertyListHeader.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimatedPropertyName.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimationDetailContainer.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimationDetailHeader.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimationItem.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimationList.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimationListContainer.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimationListHeader.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimationTarget.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimationTimelineTickItem.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimationTimelineTickList.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/App.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/KeyframesProgressTickItem.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/KeyframesProgressTickList.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/NoAnimationPanel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/graph/AnimationName.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/graph/ComputedTimingPath.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/graph/DelaySign.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/graph/EffectTimingPath.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/graph/EndDelaySign.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/graph/NegativeDelayPath.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/graph/NegativeEndDelayPath.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/graph/NegativePath.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/graph/SummaryGraph.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/graph/SummaryGraphPath.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/graph/TimingPath.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/keyframes-graph/ColorPath.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/keyframes-graph/ComputedStylePath.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/keyframes-graph/DiscretePath.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/keyframes-graph/DistancePath.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/keyframes-graph/KeyframeMarkerItem.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/keyframes-graph/KeyframeMarkerList.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/keyframes-graph/KeyframesGraph.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/keyframes-graph/KeyframesGraphPath.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/reducers/animations.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/utils/graph-helper.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/utils/l10n.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/utils/timescale.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/animation/utils/utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/actions/box-model.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/actions/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/box-model.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/components/BoxModel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/components/BoxModelApp.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/components/BoxModelEditable.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/components/BoxModelInfo.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/components/BoxModelMain.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/components/BoxModelProperties.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/components/ComputedProperty.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/reducers/box-model.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/types.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/utils/editing-session.js
 lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/breadcrumbs.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/changes/actions/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/changes/changes.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/changes/components/ChangesApp.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/changes/reducers/changes.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/changes/reducers/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/components/InspectorTabPanel.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/components/InspectorTabPanel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/computed/computed.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/events/actions/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/events/components/EventsApp.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/events/events.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/events/reducers/events.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/events/reducers/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/extensions/actions/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/extensions/actions/sidebar.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/extensions/components/ExtensionSidebar.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/extensions/components/ObjectTreeView.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/extensions/components/ObjectValueGripView.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/extensions/extension-sidebar.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/extensions/reducers/sidebar.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/extensions/types.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/actions/flexbox.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/actions/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/components/Flexbox.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/components/FlexboxItem.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/flexbox.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/reducers/flexbox.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/reducers/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/types.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/fonts/actions/font-options.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/fonts/actions/fonts.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/fonts/actions/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/fonts/components/Font.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/fonts/components/FontList.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/fonts/components/FontPreview.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/fonts/components/FontsApp.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/fonts/fonts.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/fonts/reducers/font-options.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/fonts/reducers/fonts.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/fonts/types.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/fonts/utils/l10n.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/grids/actions/grids.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/grids/actions/highlighter-settings.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/grids/actions/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/grids/components/Grid.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/grids/components/GridDisplaySettings.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/grids/components/GridItem.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/grids/components/GridList.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/grids/components/GridOutline.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/grids/grid-inspector.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/grids/reducers/grids.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/grids/reducers/highlighter-settings.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/grids/types.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/grids/utils/utils.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/inspector/layout/components/Accordion.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/layout/components/Accordion.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/layout/components/LayoutApp.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/layout/layout.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/layout/utils/l10n.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/markup/markup.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/markup/utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/element-container.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/element-editor.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/html-editor.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/markup-container.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/read-only-container.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/read-only-editor.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/root-container.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/text-container.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/text-editor.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/reducers.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/rules/models/element-style.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/rules/models/rule.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/rules/models/text-property.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/rules/rules.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/rules/views/class-list-previewer.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/rules/views/rule-editor.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/rules/views/text-property-editor.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/shared/dom-node-preview.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/shared/highlighters-overlay.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/shared/node-types.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/shared/reflow-tracker.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/shared/style-inspector-menu.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/shared/tooltips-overlay.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/shared/utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/store.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/inspector/toolsidebar.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/HeadersPanel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/HeadersToolbar.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/JsonPanel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/JsonToolbar.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/LiveText.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/MainTabbedArea.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/SearchBox.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/TextPanel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/jsonview/components/TextToolbar.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/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/census-display.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/label-display.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/sizes.js
 lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/actions/snapshot.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/actions/task-cache.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/actions/tree-map-display.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/actions/view.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/components/Census.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/components/CensusHeader.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/components/CensusTreeItem.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/components/DominatorTree.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/components/DominatorTreeHeader.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/components/DominatorTreeItem.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/Individuals.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/components/IndividualsHeader.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/ShortestPaths.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/components/SnapshotListItem.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/TreeMap.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/components/tree-map/canvas-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/components/tree-map/color-coarse-type.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/components/tree-map/drag-zoom.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/components/tree-map/draw.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/components/tree-map/start.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/dominator-tree-lazy-children.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/census-display.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/individuals.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/reducers/label-display.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/reducers/sizes.js
 lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/reducers/snapshots.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/reducers/tree-map-display.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/memory/reducers/view.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/menus.js
 lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/batching.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/filters.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/requests.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/selection.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/sort.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/timing-markers.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/ui.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/App.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/CookiesPanel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/CustomRequestPanel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/DropHarHandler.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/HeadersPanel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/HtmlPreview.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/MdnLink.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/MonitorPanel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/NetworkDetailsPanel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/ParamsPanel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/PropertiesView.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestList.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnCause.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnContentSize.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnCookies.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnDomain.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnFile.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnMethod.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnProtocol.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnRemoteIP.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnResponseHeader.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnScheme.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnSetCookies.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnStatus.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnTime.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnTransferredSize.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnType.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnWaterfall.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListContent.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListEmptyNotice.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListHeader.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListItem.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/ResponsePanel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/SecurityPanel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/SourceEditor.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/StackTracePanel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/StatisticsPanel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/StatusBar.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/TabboxPanel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/TimingsPanel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/Toolbar.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/connector/firefox-connector.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/connector/firefox-data-provider.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/connector/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/constants.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/create-store.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/har-automation.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/har-builder-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/har-builder.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/har-collector.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/har-exporter.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/har-importer.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/har-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/toolbox-overlay.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/middleware/batching.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/middleware/prefs.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/middleware/recording.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/middleware/thunk.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/batching.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/filters.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/requests.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/sort.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/timing-markers.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/ui.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/selectors/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/selectors/requests.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/selectors/timing-markers.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/selectors/ui.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/filter-autocomplete-provider.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/filter-predicates.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/filter-text-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/firefox/open-request-in-tab.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/format-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/headers-provider.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/l10n.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/mdn-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/menu.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/open-request-in-tab.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/prefs.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/request-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/sort-predicates.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/sort-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/widgets/RequestListContextMenu.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/widgets/RequestListHeaderContextMenu.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/netmonitor/src/widgets/WaterfallBackground.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance-new/components/Perf.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance-new/panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/components/jit-optimizations-item.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/components/jit-optimizations.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/components/recording-button.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/components/recording-controls.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/components/recording-list-item.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/components/recording-list.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/components/waterfall-header.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/components/waterfall-tree-row.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/components/waterfall-tree.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/components/waterfall.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/categories.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/modules/constants.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/marker-blueprint-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/modules/marker-dom-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/modules/marker-formatters.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/utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/modules/waterfall-ticks.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/performance/test/helpers/actions.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/dom-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/event-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/input-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/panel-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/prefs.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/profiler-mm-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/recording-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/synth-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/tab-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/urls.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/wait-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/devices.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/display-pixel-ratio.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/location.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/network-throttling.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/reload-conditions.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/screenshot.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/touch-simulation.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/viewports.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/app.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/browser/content.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/browser/swap.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/browser/tunnel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/browser/web-navigation.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/commands.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/components/Browser.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/components/DeviceAdder.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/components/DeviceModal.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/components/DevicePixelRatioSelector.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/components/DeviceSelector.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/components/GlobalToolbar.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/components/NetworkThrottlingSelector.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/components/ReloadConditions.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/components/ResizableViewport.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/components/ToggleMenu.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/components/Viewport.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/components/ViewportDimension.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/components/ViewportToolbar.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/components/Viewports.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/constants.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/images/grippers.svg
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/images/rotate-viewport.svg
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/images/screenshot.svg
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/images/select-arrow.svg
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/images/touch-events.svg
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/index.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/manager.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/devices.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/display-pixel-ratio.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/location.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/network-throttling.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/reload-conditions.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/screenshot.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/touch-simulation.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/viewports.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/responsive-ua.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/store.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/types.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/css.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/e10s.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/key.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/l10n.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/message.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/notification.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/window.js
 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/components/AutoCompletePopup.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/Frame.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/HSplitBox.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/NotificationBox.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/NotificationBox.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/SearchBox.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/SidebarToggle.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/SidebarToggle.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/StackTrace.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/VirtualizedTree.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/VisibilityHandler.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/reps/reps.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/reps/reps.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/splitter/Draggable.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/splitter/SplitBox.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/splitter/SplitBox.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/tabs/TabBar.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/tabs/TabBar.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/tabs/Tabs.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/tabs/Tabs.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/tree/LabelCell.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/tree/ObjectProvider.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/tree/TreeCell.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/tree/TreeHeader.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/tree/TreeRow.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/tree/TreeView.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/components/tree/TreeView.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/css-angle.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/curl.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/demangle.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/developer-toolbar.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/enum.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/file-saver.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/key-shortcuts.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/keycodes.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/natural-sort.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/network-throttling-profiles.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/prefs.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/react-utils.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/debounce.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
@@ -963,20 +1266,44 @@ lib/tor-browser/browser/chrome/devtools/
 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/redux/visibility-handler-connect.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/scroll.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/source-map/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/source-map/worker.js
 lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/source-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/stylesheet-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/suggestion-picker.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/WasmDis.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/vendor/WasmParser.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/vendor/immutable.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/vendor/jsol.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/vendor/jszip.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/vendor/lodash.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-factories.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-server.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-test-utils.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-prop-types.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-test-renderer-shallow.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/reselect.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/vendor/stringvalidator/util/assert.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/vendor/stringvalidator/validator.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/view-source.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/webgl-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/webpack/shims/platform-clipboard-stub.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/webpack/shims/platform-stack-stub.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/Chart.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/ColorWidget.js
 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
@@ -985,20 +1312,32 @@ lib/tor-browser/browser/chrome/devtools/
 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/shared/widgets/tooltip/EventTooltipHelper.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/HTMLTooltip.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/ImageTooltipHelper.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/InlineTooltip.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/SwatchBasedEditorTooltip.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/SwatchColorPickerTooltip.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/SwatchCubicBezierTooltip.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/SwatchFilterTooltip.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/Tooltip.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/TooltipToggle.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/VariableContentHelper.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/VariableTooltipHelper.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/widgets/view-helpers.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/shared/zoom-keys.js
 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-commands-controller.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
@@ -1008,144 +1347,307 @@ lib/tor-browser/browser/chrome/devtools/
 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/sourceeditor/wasm.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/original-source.js
 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/audio/shutter.wav
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/themes/commandline-browser.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/themes/common.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/themes/splitters.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/themes/toolbars.css
 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/jsterm.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/cookies-tab.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/headers-tab.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/net-info-body.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/net-info-body.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/net-info-group-list.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/net-info-group.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/net-info-group.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/net-info-params.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/net-info-params.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/params-tab.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/post-tab.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/response-tab.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/response-tab.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/size-limit.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/size-limit.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/spinner.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/stacktrace-tab.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/data-provider.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/main.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/net-request.css
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/net-request.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/utils/events.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/utils/json.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/net/utils/net.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/actions/filters.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/actions/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/actions/messages.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/actions/ui.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/CollapseButton.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/ConsoleOutput.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/ConsoleTable.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/FilterBar.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/FilterButton.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/FilterCheckbox.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/GripMessageBody.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/Message.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/MessageContainer.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/MessageIcon.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/MessageIndent.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/MessageRepeat.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/SideBar.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/ConsoleApiCall.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/ConsoleCommand.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/DefaultRenderer.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/EvaluationResult.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/NetworkEventMessage.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/PageError.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/constants.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/main.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/new-console-output-wrapper.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/reducers/filters.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/reducers/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/reducers/messages.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/reducers/prefs.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/reducers/ui.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/selectors/filters.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/selectors/messages.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/selectors/prefs.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/selectors/ui.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/store.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/stub-snippets.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/test/fixtures/stubs/consoleApi.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/test/fixtures/stubs/cssMessage.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/test/fixtures/stubs/evaluationResult.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/test/fixtures/stubs/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/test/fixtures/stubs/networkEvent.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/test/fixtures/stubs/pageError.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/types.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/utils/context-menu.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/utils/id-generator.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/utils/messages.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/utils/object-inspector.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/utils/prefs.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/new-webconsole.js
 lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/panel.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/webconsole-connection-proxy.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/client/webconsole/webconsole-l10n.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/accessibility-parent.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/accessibility.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/addons.js
 lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/animation.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/breakpoint.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/content.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/css-properties.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/emulation.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/emulation/touch-simulator.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/environment.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/errordocs.js
 lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/eventlooplag.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/frame.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/accessible.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-grid.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/eye-dropper.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/highlighters/flexbox.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/paused-debugger.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/shapes.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/accessibility.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/highlighters/utils/canvas.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/highlighters/xul-accessible.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/inspector/document-walker.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/inspector/inspector.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/inspector/node.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/inspector/utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/inspector/walker.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/pause-scoped.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/perf.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/reflow.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/source.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/tab.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/thread.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/breakpoint-actor-map.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/utils/css-grid-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/utils/event-loop.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/shapes-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/utils/source-actor-store.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/webconsole/content-process-forward.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/webconsole/listeners.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/webconsole/utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/webconsole/worker-listeners.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/webextension-inspected-window.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/webextension-parent.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/webextension.js
 lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/webgl.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/window.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/actors/worker-list.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-process-debugger-server.js
 lib/tor-browser/browser/chrome/devtools/modules/devtools/server/content-server.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/css-logic.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/event-parsers.js
 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/primitive.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/service-worker-child.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/server/websocket-server.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/ThreadSafeDevToolsUtils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/acorn/acorn.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/acorn/acorn_loose.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/acorn/walk.js
 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/base-loader.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/builtin-modules.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/client/addon-client.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/client/array-buffer-client.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/client/breakpoint-client.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/client/constants.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/client/debugger-client.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/client/environment-client.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/client/event-source.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/client/long-string-client.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/client/object-client.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/client/property-iterator-client.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/client/root-client.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/client/source-client.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/client/symbol-iterator-client.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/client/tab-client.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/client/thread-client.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/client/trace-client.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/client/worker-client.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/css/color-db.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/css/color.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/css/generated/properties-db.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/css/lexer.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/css/parsing-utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/css/properties-db.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/debounce.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/defer.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/dom-node-constants.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/dom-node-filter-constants.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/extend.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/flags.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/accessibility.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/actor-registry.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/addons.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/animation.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/call-watcher.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/canvas.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/css-properties.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/csscoverage.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/device.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/emulation.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/eventlooplag.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/framerate.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/gcli.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/highlighters.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/inspector.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/layout.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/memory.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/node.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/perf.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/performance-recording.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/performance.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/preference.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/promises.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/reflow.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/storage.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/string.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/styles.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/stylesheets.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/timeline.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/webaudio.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/webextension-inspected-window.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/fronts/webgl.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/gcli/command-state.js
 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
@@ -1167,17 +1669,11 @@ lib/tor-browser/browser/chrome/devtools/
 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
@@ -1234,13 +1730,18 @@ lib/tor-browser/browser/chrome/devtools/
 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/gcli/templater.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/generate-uuid.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/heapsnapshot/shortest-paths.js
 lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/indentation.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/indexed-db.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/inspector/css-logic.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
@@ -1248,12 +1749,20 @@ lib/tor-browser/browser/chrome/devtools/
 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/l10n.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/layout/dom-matrix-2d.js
 lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/layout/utils.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/loader-plugin-raw.jsm
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/node-properties/node-properties.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/old-event-emitter.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/platform/clipboard.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/platform/stack.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/plural-form.js
 lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/pretty-fast/pretty-fast.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/protocol.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
@@ -1262,167 +1771,228 @@ lib/tor-browser/browser/chrome/devtools/
 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/specs/accessibility.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/actor-registry.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/addons.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/animation.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/breakpoint.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/call-watcher.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/canvas.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/css-properties.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/csscoverage.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/device.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/emulation.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/environment.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/eventlooplag.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/frame.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/framerate.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/gcli.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/heap-snapshot-file.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/highlighters.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/index.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/inspector.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/layout.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/memory.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/node.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/perf.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/performance-recording.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/performance.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/preference.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/promises.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/reflow.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/script.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/source.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/storage.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/string.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/styles.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/stylesheets.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/timeline.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/webaudio.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/webextension-inspected-window.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/webextension-parent.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/webgl.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/specs/worker.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/sprintfjs/sprintf.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/task.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/throttle.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/transport/websocket-transport.js
+lib/tor-browser/browser/chrome/devtools/modules/devtools/shared/wasm-source-map.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/webconsole/throttle.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/animation.css
 lib/tor-browser/browser/chrome/devtools/skin/animationinspector.css
+lib/tor-browser/browser/chrome/devtools/skin/boxmodel.css
+lib/tor-browser/browser/chrome/devtools/skin/breadcrumbs.css
 lib/tor-browser/browser/chrome/devtools/skin/canvasdebugger.css
+lib/tor-browser/browser/chrome/devtools/skin/chart.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/components-frame.css
+lib/tor-browser/browser/chrome/devtools/skin/components-h-split-box.css
+lib/tor-browser/browser/chrome/devtools/skin/computed.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/devtools-browser.css
+lib/tor-browser/browser/chrome/devtools/skin/firebug-theme.css
+lib/tor-browser/browser/chrome/devtools/skin/floating-scrollbars-dark-theme.css
+lib/tor-browser/browser/chrome/devtools/skin/floating-scrollbars-responsive-design.css
+lib/tor-browser/browser/chrome/devtools/skin/fonts.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@localhost
+lib/tor-browser/browser/chrome/devtools/skin/images/angle-swatch.svg
 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@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/breadcrumbs-divider%2x.png@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/breadcrumbs-scrollbutton.png
-lib/tor-browser/browser/chrome/devtools/skin/images/breadcrumbs-scrollbutton%2x.png@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/close.png
-lib/tor-browser/browser/chrome/devtools/skin/images/close%2x.png@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/command-console.png
-lib/tor-browser/browser/chrome/devtools/skin/images/command-console%2x.png@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/command-eyedropper.png
-lib/tor-browser/browser/chrome/devtools/skin/images/command-eyedropper%2x.png@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/command-frames.png
-lib/tor-browser/browser/chrome/devtools/skin/images/command-frames%2x.png@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/command-measure.png
-lib/tor-browser/browser/chrome/devtools/skin/images/command-measure%2x.png@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/command-paintflashing.png
-lib/tor-browser/browser/chrome/devtools/skin/images/command-paintflashing%2x.png@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/command-pick.png
-lib/tor-browser/browser/chrome/devtools/skin/images/command-pick%2x.png@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/command-responsivemode.png
-lib/tor-browser/browser/chrome/devtools/skin/images/command-responsivemode%2x.png@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/command-rulers.png
-lib/tor-browser/browser/chrome/devtools/skin/images/command-rulers%2x.png@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/command-scratchpad.png
-lib/tor-browser/browser/chrome/devtools/skin/images/command-scratchpad%2x.png@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/command-screenshot.png
-lib/tor-browser/browser/chrome/devtools/skin/images/command-screenshot%2x.png@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/command-tilt.png
-lib/tor-browser/browser/chrome/devtools/skin/images/command-tilt%2x.png@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/commandline-icon.png
-lib/tor-browser/browser/chrome/devtools/skin/images/commandline-icon%2x.png@localhost
+lib/tor-browser/browser/chrome/devtools/skin/images/breadcrumbs-divider.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/breadcrumbs-scrollbutton.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/breakpoint.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/clear.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/close.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/command-console.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/command-eyedropper.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/command-frames.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/command-measure.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/command-noautohide.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/command-paintflashing.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/command-pick.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/command-responsivemode.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/command-rulers.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/command-screenshot.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/commandline-icon.svg
 lib/tor-browser/browser/chrome/devtools/skin/images/controls.png
 lib/tor-browser/browser/chrome/devtools/skin/images/controls%2x.png@localhost
+lib/tor-browser/browser/chrome/devtools/skin/images/copy.svg
 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@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/debugger-blackbox.png
-lib/tor-browser/browser/chrome/devtools/skin/images/debugger-blackbox%2x.png@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/debugger-collapse.png
-lib/tor-browser/browser/chrome/devtools/skin/images/debugger-collapse%2x.png@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/debugger-expand.png
-lib/tor-browser/browser/chrome/devtools/skin/images/debugger-expand%2x.png@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/debugger-pause.png
-lib/tor-browser/browser/chrome/devtools/skin/images/debugger-pause%2x.png@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/debugger-play.png
-lib/tor-browser/browser/chrome/devtools/skin/images/debugger-play%2x.png@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/debugger-prettyprint.png
-lib/tor-browser/browser/chrome/devtools/skin/images/debugger-prettyprint%2x.png@localhost
-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@localhost
-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@localhost
-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@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/debugger-toggleBreakpoints.png
-lib/tor-browser/browser/chrome/devtools/skin/images/debugger-toggleBreakpoints%2x.png@localhost
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-step-in.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-step-out.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-step-over.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger-toggleBreakpoints.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger/arrow.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger/back.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger/blackBox.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger/close.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger/domain.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger/file.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger/folder.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger/forward.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger/pause-exceptions.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger/pause.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger/prettyPrint.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger/react.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger/resume.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger/stepIn.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger/stepOut.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/debugger/stepOver.svg
 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-tabs.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@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/dock-bottom-minimize%2x.png@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/dock-bottom%2x.png@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/dock-side%2x.png@localhost
+lib/tor-browser/browser/chrome/devtools/skin/images/diff.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/dock-bottom.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/dock-side.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/dock-undock.svg
 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@localhost
-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@localhost
 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@localhost
 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/filter.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@localhost
-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@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/magnifying-glass.png
-lib/tor-browser/browser/chrome/devtools/skin/images/magnifying-glass%2x.png@localhost
-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/firebug/arrow-down.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/arrow-up.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/breakpoint.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/close.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/command-console.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/command-eyedropper.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/command-frames.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/command-measure.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/command-noautohide.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/command-paintflashing.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/command-pick.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/command-responsivemode.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/command-rulers.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/command-scratchpad.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/command-screenshot.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/commandline-icon.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/debugger-blackbox.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/debugger-prettyprint.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/debugger-step-in.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/debugger-step-out.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/debugger-step-over.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/debugger-toggleBreakpoints.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/disable.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/dock-bottom.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/dock-side.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/dock-undock.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/pane-collapse.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/pane-expand.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/pause.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/play.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/read-only.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/rewind.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/tool-debugger-paused.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/tool-options.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/twisty-closed-firebug.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/firebug/twisty-open-firebug.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/gcli_sec_bad.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/gcli_sec_good.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/gcli_sec_moderate.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/geometry-editor.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/globe.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/grid.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/help.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/import.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/item-arrow-dark-ltr.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/item-arrow-dark-rtl.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/item-arrow-ltr.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/item-arrow-rtl.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/item-toggle.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/jump-definition.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/pane-collapse.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/pane-expand.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/pause.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/performance-details-call-tree.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/performance-details-flamegraph.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/performance-details-waterfall.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/play.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@localhost
-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@localhost
-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@localhost
-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@localhost
-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@localhost
-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@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/rewind.png
-lib/tor-browser/browser/chrome/devtools/skin/images/rewind%2x.png@localhost
+lib/tor-browser/browser/chrome/devtools/skin/images/rewind.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/sad-face.svg
 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/search.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/sort-ascending-arrow.svg
+lib/tor-browser/browser/chrome/devtools/skin/images/sort-descending-arrow.svg
 lib/tor-browser/browser/chrome/devtools/skin/images/toggle-tools.png
 lib/tor-browser/browser/chrome/devtools/skin/images/toggle-tools%2x.png@localhost
 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-dom.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
@@ -1432,7 +2002,6 @@ lib/tor-browser/browser/chrome/devtools/
 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@localhost
-lib/tor-browser/browser/chrome/devtools/skin/images/undock%2x.png@localhost
 lib/tor-browser/browser/chrome/devtools/skin/images/vview-delete.png
 lib/tor-browser/browser/chrome/devtools/skin/images/vview-delete%2x.png@localhost
 lib/tor-browser/browser/chrome/devtools/skin/images/vview-edit.png
@@ -1443,21 +2012,21 @@ lib/tor-browser/browser/chrome/devtools/
 lib/tor-browser/browser/chrome/devtools/skin/images/vview-open-inspector%2x.png@localhost
 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/jit-optimizations.css
+lib/tor-browser/browser/chrome/devtools/skin/layout.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/markup.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/perf.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/rules.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/toolbox.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@localhost
 lib/tor-browser/browser/chrome/devtools/skin/tooltip/arrow-horizontal-light.png
@@ -1466,7 +2035,7 @@ lib/tor-browser/browser/chrome/devtools/
 lib/tor-browser/browser/chrome/devtools/skin/tooltip/arrow-vertical-dark%2x.png@localhost
 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@localhost
-lib/tor-browser/browser/chrome/devtools/skin/variables.css
+lib/tor-browser/browser/chrome/devtools/skin/tooltips.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
@@ -1474,21 +2043,18 @@ lib/tor-browser/browser/chrome/en-US/loc
 lib/tor-browser/browser/chrome/en-US/locale/branding/brand.properties
 lib/tor-browser/browser/chrome/en-US/locale/branding/browserconfig.properties
 lib/tor-browser/browser/chrome/en-US/locale/browser-region/region.properties
-lib/tor-browser/browser/chrome/en-US/locale/browser/aboutAccounts.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/aboutCertError.dtd
 lib/tor-browser/browser/chrome/en-US/locale/browser/aboutDialog.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/aboutHealthReport.dtd
 lib/tor-browser/browser/chrome/en-US/locale/browser/aboutHome.dtd
 lib/tor-browser/browser/chrome/en-US/locale/browser/aboutPrivateBrowsing.dtd
 lib/tor-browser/browser/chrome/en-US/locale/browser/aboutPrivateBrowsing.properties
 lib/tor-browser/browser/chrome/en-US/locale/browser/aboutRobots.dtd
+lib/tor-browser/browser/chrome/en-US/locale/browser/aboutSearchReset.dtd
 lib/tor-browser/browser/chrome/en-US/locale/browser/aboutSessionRestore.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/aboutSyncTabs.dtd
 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/bookmarks.html
 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
@@ -1502,22 +2068,22 @@ lib/tor-browser/browser/chrome/en-US/loc
 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
-lib/tor-browser/browser/chrome/en-US/locale/browser/newTab.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/newTab.properties
 lib/tor-browser/browser/chrome/en-US/locale/browser/pageInfo.dtd
 lib/tor-browser/browser/chrome/en-US/locale/browser/pageInfo.properties
 lib/tor-browser/browser/chrome/en-US/locale/browser/places/bookmarkProperties.properties
 lib/tor-browser/browser/chrome/en-US/locale/browser/places/editBookmarkOverlay.dtd
-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/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/clearSiteData.dtd
+lib/tor-browser/browser/chrome/en-US/locale/browser/preferences/clearSiteData.properties
 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/containers.dtd
+lib/tor-browser/browser/chrome/en-US/locale/browser/preferences/containers.properties
 lib/tor-browser/browser/chrome/en-US/locale/browser/preferences/content.dtd
 lib/tor-browser/browser/chrome/en-US/locale/browser/preferences/cookies.dtd
 lib/tor-browser/browser/chrome/en-US/locale/browser/preferences/fonts.dtd
@@ -1530,76 +2096,79 @@ lib/tor-browser/browser/chrome/en-US/loc
 lib/tor-browser/browser/chrome/en-US/locale/browser/preferences/search.dtd
 lib/tor-browser/browser/chrome/en-US/locale/browser/preferences/security.dtd
 lib/tor-browser/browser/chrome/en-US/locale/browser/preferences/selectBookmark.dtd
+lib/tor-browser/browser/chrome/en-US/locale/browser/preferences/siteDataSettings.dtd
 lib/tor-browser/browser/chrome/en-US/locale/browser/preferences/sync.dtd
-lib/tor-browser/browser/chrome/en-US/locale/browser/preferences/tabs.dtd
 lib/tor-browser/browser/chrome/en-US/locale/browser/preferences/translation.dtd
 lib/tor-browser/browser/chrome/en-US/locale/browser/quitDialog.properties
 lib/tor-browser/browser/chrome/en-US/locale/browser/safeMode.dtd
 lib/tor-browser/browser/chrome/en-US/locale/browser/safebrowsing/phishing-afterload-warning-message.dtd
 lib/tor-browser/browser/chrome/en-US/locale/browser/safebrowsing/report-phishing.dtd
+lib/tor-browser/browser/chrome/en-US/locale/browser/safebrowsing/safebrowsing.properties
 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/amazon-au.xml
+lib/tor-browser/browser/chrome/en-US/locale/browser/searchplugins/amazon-ca.xml
 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-2018.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/images/amazon.ico
+lib/tor-browser/browser/chrome/en-US/locale/browser/searchplugins/images/ebay.ico
+lib/tor-browser/browser/chrome/en-US/locale/browser/searchplugins/images/wikipedia.ico
+lib/tor-browser/browser/chrome/en-US/locale/browser/searchplugins/images/yahoo.ico
+lib/tor-browser/browser/chrome/en-US/locale/browser/searchplugins/images/yandex-en.ico
+lib/tor-browser/browser/chrome/en-US/locale/browser/searchplugins/images/yandex-ru.ico
+lib/tor-browser/browser/chrome/en-US/locale/browser/searchplugins/list.json
 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/yandex-en.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/siteData.properties
 lib/tor-browser/browser/chrome/en-US/locale/browser/sitePermissions.properties
 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/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.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/uiDensity.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/boxmodel.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/components.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/dom.properties
 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/font-inspector.properties
 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/jit-optimizations.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/layout.properties
 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/menus.properties
 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/responsive.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
@@ -1607,11 +2176,11 @@ lib/tor-browser/browser/chrome/en-US/loc
 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/startup.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/client/storage.dtd
 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
@@ -1623,22 +2192,31 @@ lib/tor-browser/browser/chrome/en-US/loc
 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/eyedropper.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/shared.properties
 lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/shared/styleinspector.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/shim/aboutdevtools.dtd
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/shim/aboutdevtools.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/shim/key-shortcuts.properties
+lib/tor-browser/browser/chrome/en-US/locale/en-US/devtools/shim/startup.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/default128.png
 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/icons/default/default64.png
 lib/tor-browser/browser/chrome/pdfjs/content/PdfJs.jsm
+lib/tor-browser/browser/chrome/pdfjs/content/PdfJsNetwork.jsm
 lib/tor-browser/browser/chrome/pdfjs/content/PdfJsTelemetry.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
 lib/tor-browser/browser/chrome/pdfjs/content/build/pdf.js
 lib/tor-browser/browser/chrome/pdfjs/content/build/pdf.worker.js
-lib/tor-browser/browser/chrome/pdfjs/content/network.js
+lib/tor-browser/browser/chrome/pdfjs/content/pdfjschildbootstrap-enabled.js
 lib/tor-browser/browser/chrome/pdfjs/content/pdfjschildbootstrap.js
 lib/tor-browser/browser/chrome/pdfjs/content/web/cmaps/78-EUC-H.bcmap
 lib/tor-browser/browser/chrome/pdfjs/content/web/cmaps/78-EUC-V.bcmap
@@ -1844,6 +2422,8 @@ lib/tor-browser/browser/chrome/pdfjs/con
 lib/tor-browser/browser/chrome/pdfjs/content/web/images/secondaryToolbarButton-rotateCcw%2x.png@localhost
 lib/tor-browser/browser/chrome/pdfjs/content/web/images/secondaryToolbarButton-rotateCw.png
 lib/tor-browser/browser/chrome/pdfjs/content/web/images/secondaryToolbarButton-rotateCw%2x.png@localhost
+lib/tor-browser/browser/chrome/pdfjs/content/web/images/secondaryToolbarButton-selectTool.png
+lib/tor-browser/browser/chrome/pdfjs/content/web/images/secondaryToolbarButton-selectTool%2x.png@localhost
 lib/tor-browser/browser/chrome/pdfjs/content/web/images/shadow.png
 lib/tor-browser/browser/chrome/pdfjs/content/web/images/texture.png
 lib/tor-browser/browser/chrome/pdfjs/content/web/images/toolbarButton-bookmark.png
@@ -1894,7 +2474,6 @@ lib/tor-browser/browser/chrome/pdfjs/con
 lib/tor-browser/browser/chrome/pdfjs/content/web/images/treeitem-collapsed%2x.png@localhost
 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@localhost
-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
@@ -1904,16 +2483,8 @@ lib/tor-browser/browser/chrome/webide/co
 lib/tor-browser/browser/chrome/webide/content/details.xhtml
 lib/tor-browser/browser/chrome/webide/content/devicepreferences.js
 lib/tor-browser/browser/chrome/webide/content/devicepreferences.xhtml
-lib/tor-browser/browser/chrome/webide/content/devicesettings.js
-lib/tor-browser/browser/chrome/webide/content/devicesettings.xhtml
-lib/tor-browser/browser/chrome/webide/content/logs.js
-lib/tor-browser/browser/chrome/webide/content/logs.xhtml
-lib/tor-browser/browser/chrome/webide/content/monitor.js
-lib/tor-browser/browser/chrome/webide/content/monitor.xhtml
 lib/tor-browser/browser/chrome/webide/content/newapp.js
 lib/tor-browser/browser/chrome/webide/content/newapp.xul
-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
@@ -1924,8 +2495,6 @@ lib/tor-browser/browser/chrome/webide/co
 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
@@ -1936,116 +2505,156 @@ lib/tor-browser/browser/chrome/webide/sk
 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/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
 lib/tor-browser/browser/components/ChromeProfileMigrator.js
+lib/tor-browser/browser/components/EnterprisePolicies.js
+lib/tor-browser/browser/components/EnterprisePoliciesContent.js
 lib/tor-browser/browser/components/ExperimentsService.js
 lib/tor-browser/browser/components/FeedConverter.js
 lib/tor-browser/browser/components/FeedWriter.js
 lib/tor-browser/browser/components/FirefoxProfileMigrator.js
 lib/tor-browser/browser/components/ProfileMigrator.js
-lib/tor-browser/browser/components/SelfSupportService.js
 lib/tor-browser/browser/components/WebContentConverter.js
+lib/tor-browser/browser/components/aboutNewTabService.js
+lib/tor-browser/browser/components/aboutdebugging-registration.js
+lib/tor-browser/browser/components/aboutdevtools-registration.js
+lib/tor-browser/browser/components/aboutdevtoolstoolbox-registration.js
 lib/tor-browser/browser/components/components.manifest
-lib/tor-browser/browser/components/devtools-clhandler.js
-lib/tor-browser/browser/components/fuelApplication.js
+lib/tor-browser/browser/components/devtools-startup.js
 lib/tor-browser/browser/components/interfaces.xpt
-lib/tor-browser/browser/components/libbrowsercomps.so
+lib/tor-browser/browser/components/nsAboutCapabilities.js
 lib/tor-browser/browser/components/nsBrowserContentHandler.js
 lib/tor-browser/browser/components/nsBrowserGlue.js
 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/blocklists/addons.json
+lib/tor-browser/browser/defaults/blocklists/certificates.json
+lib/tor-browser/browser/defaults/blocklists/gfx.json
+lib/tor-browser/browser/defaults/blocklists/plugins.json
 lib/tor-browser/browser/defaults/permissions
+lib/tor-browser/browser/defaults/pinning/pins.json
 lib/tor-browser/browser/defaults/preferences/000-tor-browser.js
+lib/tor-browser/browser/defaults/preferences/debugger.js
+lib/tor-browser/browser/defaults/preferences/devtools-startup-prefs.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
 lib/tor-browser/browser/defaults/preferences/webide-prefs.js
-lib/tor-browser/browser/defaults/profile/bookmarks.html
-lib/tor-browser/browser/defaults/profile/chrome/userChrome-example.css
-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/features/onboarding%mozilla.org@localhost/bootstrap.js
+lib/tor-browser/browser/features/onboarding%mozilla.org@localhost/chrome.manifest
+lib/tor-browser/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/close.png
+lib/tor-browser/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_tor-circuit-display.png
+lib/tor-browser/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_tor-expect-differences.png
+lib/tor-browser/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_tor-network.png
+lib/tor-browser/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_tor-onion-services.png
+lib/tor-browser/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_tor-privacy.png
+lib/tor-browser/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_tor-security.png
+lib/tor-browser/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_tor-welcome.png
+lib/tor-browser/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_no-icon.png
+lib/tor-browser/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_tour-complete.png
+lib/tor-browser/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_tour-complete.svg
+lib/tor-browser/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/tor-watermark.png
+lib/tor-browser/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/tor-watermark.svg
+lib/tor-browser/browser/features/onboarding%mozilla.org@localhost/chrome/content/lib/UITour-lib.js
+lib/tor-browser/browser/features/onboarding%mozilla.org@localhost/chrome/content/modules/OnboardingTourType.jsm
+lib/tor-browser/browser/features/onboarding%mozilla.org@localhost/chrome/content/onboarding-tor-circuit-display.js
+lib/tor-browser/browser/features/onboarding%mozilla.org@localhost/chrome/content/onboarding-tour-agent.js
+lib/tor-browser/browser/features/onboarding%mozilla.org@localhost/chrome/content/onboarding.css
+lib/tor-browser/browser/features/onboarding%mozilla.org@localhost/chrome/content/onboarding.js
+lib/tor-browser/browser/features/onboarding%mozilla.org@localhost/en-US/locale/en-US/onboarding.properties
+lib/tor-browser/browser/features/onboarding%mozilla.org@localhost/install.rdf
+lib/tor-browser/browser/localization/en-US/branding/brand.ftl
+lib/tor-browser/browser/localization/en-US/branding/tor-browser-brand.ftl
+lib/tor-browser/browser/localization/en-US/browser/branding/sync-brand.ftl
+lib/tor-browser/browser/localization/en-US/browser/preferences/preferences.ftl
 lib/tor-browser/browser/modules/AboutHome.jsm
 lib/tor-browser/browser/modules/AboutNewTab.jsm
+lib/tor-browser/browser/modules/AsyncTabSwitcher.jsm
+lib/tor-browser/browser/modules/AttributionCode.jsm
+lib/tor-browser/browser/modules/AutoMigrate.jsm
+lib/tor-browser/browser/modules/BrowserErrorReporter.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/BrowserUsageTelemetry.jsm
+lib/tor-browser/browser/modules/ChromeMigrationUtils.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/ContentMetaHandler.jsm
+lib/tor-browser/browser/modules/ContentObservers.js
 lib/tor-browser/browser/modules/ContentSearch.jsm
 lib/tor-browser/browser/modules/ContentWebRTC.jsm
+lib/tor-browser/browser/modules/ContextMenu.jsm
 lib/tor-browser/browser/modules/CustomizableUI.jsm
 lib/tor-browser/browser/modules/CustomizableWidgets.jsm
-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/DownloadsSubview.jsm
 lib/tor-browser/browser/modules/DownloadsTaskbar.jsm
 lib/tor-browser/browser/modules/DownloadsViewUI.jsm
 lib/tor-browser/browser/modules/DragPositionManager.jsm
-lib/tor-browser/browser/modules/E10SUtils.jsm
+lib/tor-browser/browser/modules/ExtensionPopups.jsm
+lib/tor-browser/browser/modules/ExtensionsUI.jsm
 lib/tor-browser/browser/modules/Feeds.jsm
 lib/tor-browser/browser/modules/FormSubmitObserver.jsm
 lib/tor-browser/browser/modules/FormValidationHandler.jsm
-lib/tor-browser/browser/modules/HiddenFrame.jsm
+lib/tor-browser/browser/modules/HeadlessShell.jsm
+lib/tor-browser/browser/modules/LaterRun.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/OpenInTabsUtils.jsm
+lib/tor-browser/browser/modules/PageActions.jsm
+lib/tor-browser/browser/modules/PanelMultiView.jsm
+lib/tor-browser/browser/modules/ParseBreakpadSymbols-worker.js
+lib/tor-browser/browser/modules/ParseCppFiltSymbols-worker.js
+lib/tor-browser/browser/modules/ParseNMSymbols-worker.js
+lib/tor-browser/browser/modules/ParseSymbols.jsm
+lib/tor-browser/browser/modules/PermissionUI.jsm
+lib/tor-browser/browser/modules/PingCentre.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
 lib/tor-browser/browser/modules/RemotePrompt.jsm
+lib/tor-browser/browser/modules/Sanitizer.jsm
+lib/tor-browser/browser/modules/SchedulePressure.jsm
 lib/tor-browser/browser/modules/ScrollbarSampler.jsm
-lib/tor-browser/browser/modules/SelfSupportBackend.jsm
+lib/tor-browser/browser/modules/SearchWidgetTracker.jsm
+lib/tor-browser/browser/modules/ShellService.jsm
+lib/tor-browser/browser/modules/SiteDataManager.jsm
 lib/tor-browser/browser/modules/SitePermissions.jsm
-lib/tor-browser/browser/modules/Social.jsm
-lib/tor-browser/browser/modules/TabGroupsMigrator.jsm
+lib/tor-browser/browser/modules/ThemeVariableMap.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/client/framework/gDevTools.jsm
-lib/tor-browser/browser/modules/devtools/gDevTools.jsm
+lib/tor-browser/browser/modules/UpdateTopLevelContentWindowIDHelper.jsm
+lib/tor-browser/browser/modules/ZoomUI.jsm
 lib/tor-browser/browser/modules/distribution.js
 lib/tor-browser/browser/modules/experiments/Experiments.jsm
 lib/tor-browser/browser/modules/offlineAppCache.jsm
+lib/tor-browser/browser/modules/policies/BookmarksPolicies.jsm
+lib/tor-browser/browser/modules/policies/Policies.jsm
+lib/tor-browser/browser/modules/policies/PoliciesValidator.jsm
+lib/tor-browser/browser/modules/policies/ProxyPolicies.jsm
+lib/tor-browser/browser/modules/policies/WebsiteFilter.jsm
+lib/tor-browser/browser/modules/policies/schema.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
 lib/tor-browser/browser/modules/sessionstore/GlobalState.jsm
-lib/tor-browser/browser/modules/sessionstore/PageStyle.jsm
 lib/tor-browser/browser/modules/sessionstore/PrivacyFilter.jsm
-lib/tor-browser/browser/modules/sessionstore/PrivacyLevel.jsm
 lib/tor-browser/browser/modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm
 lib/tor-browser/browser/modules/sessionstore/RunState.jsm
 lib/tor-browser/browser/modules/sessionstore/SessionCookies.jsm
 lib/tor-browser/browser/modules/sessionstore/SessionFile.jsm
-lib/tor-browser/browser/modules/sessionstore/SessionHistory.jsm
 lib/tor-browser/browser/modules/sessionstore/SessionMigration.jsm
 lib/tor-browser/browser/modules/sessionstore/SessionSaver.jsm
 lib/tor-browser/browser/modules/sessionstore/SessionStorage.jsm
@@ -2057,7 +2666,14 @@ lib/tor-browser/browser/modules/sessions
 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/syncedtabs/EventEmitter.jsm
+lib/tor-browser/browser/modules/syncedtabs/SyncedTabsDeckComponent.js
+lib/tor-browser/browser/modules/syncedtabs/SyncedTabsDeckStore.js
+lib/tor-browser/browser/modules/syncedtabs/SyncedTabsDeckView.js
+lib/tor-browser/browser/modules/syncedtabs/SyncedTabsListStore.js
+lib/tor-browser/browser/modules/syncedtabs/TabListComponent.js
+lib/tor-browser/browser/modules/syncedtabs/TabListView.js
+lib/tor-browser/browser/modules/syncedtabs/util.js
 lib/tor-browser/browser/modules/translation/BingTranslator.jsm
 lib/tor-browser/browser/modules/translation/LanguageDetector.jsm
 lib/tor-browser/browser/modules/translation/Translation.jsm
@@ -2072,9 +2688,6 @@ 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/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
-lib/tor-browser/chrome/en-US/locale/en-US/formautofill/requestAutocomplete.dtd
 lib/tor-browser/chrome/en-US/locale/en-US/global-platform/mac/accessible.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global-platform/mac/intl.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global-platform/mac/platformKeys.properties
@@ -2084,11 +2697,11 @@ lib/tor-browser/chrome/en-US/locale/en-U
 lib/tor-browser/chrome/en-US/locale/en-US/global-platform/win/accessible.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global-platform/win/intl.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global-platform/win/platformKeys.properties
-lib/tor-browser/chrome/en-US/locale/en-US/global-region/region.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global/AccessFu.properties
-lib/tor-browser/chrome/en-US/locale/en-US/global/about.dtd
 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/aboutProfiles.dtd
+lib/tor-browser/chrome/en-US/locale/en-US/global/aboutProfiles.properties
 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
@@ -2097,6 +2710,8 @@ lib/tor-browser/chrome/en-US/locale/en-U
 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/aboutUrlClassifier.dtd
+lib/tor-browser/chrome/en-US/locale/en-US/global/aboutUrlClassifier.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
@@ -2109,32 +2724,24 @@ lib/tor-browser/chrome/en-US/locale/en-U
 lib/tor-browser/chrome/en-US/locale/en-US/global/commonDialogs.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global/config.dtd
 lib/tor-browser/chrome/en-US/locale/en-US/global/config.properties
-lib/tor-browser/chrome/en-US/locale/en-US/global/console.dtd
-lib/tor-browser/chrome/en-US/locale/en-US/global/console.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global/contentAreaCommands.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global/crashes.dtd
 lib/tor-browser/chrome/en-US/locale/en-US/global/crashes.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global/css.properties
-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/datetimebox.dtd
 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
 lib/tor-browser/chrome/en-US/locale/en-US/global/editMenuOverlay.dtd
+lib/tor-browser/chrome/en-US/locale/en-US/global/extensions.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global/fallbackMenubar.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global/filefield.properties
-lib/tor-browser/chrome/en-US/locale/en-US/global/filepicker.dtd
 lib/tor-browser/chrome/en-US/locale/en-US/global/filepicker.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global/findbar.dtd
 lib/tor-browser/chrome/en-US/locale/en-US/global/findbar.properties
-lib/tor-browser/chrome/en-US/locale/en-US/global/finddialog.dtd
-lib/tor-browser/chrome/en-US/locale/en-US/global/finddialog.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global/global-strres.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global/global.dtd
 lib/tor-browser/chrome/en-US/locale/en-US/global/globalKeys.dtd
-lib/tor-browser/chrome/en-US/locale/en-US/global/headsUpDisplay.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global/intl.css
 lib/tor-browser/chrome/en-US/locale/en-US/global/intl.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global/keys.properties
@@ -2146,6 +2753,7 @@ lib/tor-browser/chrome/en-US/locale/en-U
 lib/tor-browser/chrome/en-US/locale/en-US/global/layout_errors.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global/mathml/mathml.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global/mozilla.dtd
+lib/tor-browser/chrome/en-US/locale/en-US/global/narrate.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global/netError.dtd
 lib/tor-browser/chrome/en-US/locale/en-US/global/netErrorApp.dtd
 lib/tor-browser/chrome/en-US/locale/en-US/global/notification.dtd
@@ -2156,10 +2764,8 @@ lib/tor-browser/chrome/en-US/locale/en-U
 lib/tor-browser/chrome/en-US/locale/en-US/global/printPreview.dtd
 lib/tor-browser/chrome/en-US/locale/en-US/global/printPreviewProgress.dtd
 lib/tor-browser/chrome/en-US/locale/en-US/global/printProgress.dtd
-lib/tor-browser/chrome/en-US/locale/en-US/global/printdialog.dtd
 lib/tor-browser/chrome/en-US/locale/en-US/global/printdialog.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global/printing.properties
-lib/tor-browser/chrome/en-US/locale/en-US/global/printjoboptions.dtd
 lib/tor-browser/chrome/en-US/locale/en-US/global/regionNames.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global/resetProfile.dtd
 lib/tor-browser/chrome/en-US/locale/en-US/global/resetProfile.properties
@@ -2171,16 +2777,13 @@ lib/tor-browser/chrome/en-US/locale/en-U
 lib/tor-browser/chrome/en-US/locale/en-US/global/textcontext.dtd
 lib/tor-browser/chrome/en-US/locale/en-US/global/tree.dtd
 lib/tor-browser/chrome/en-US/locale/en-US/global/videocontrols.dtd
-lib/tor-browser/chrome/en-US/locale/en-US/global/viewSource.dtd
 lib/tor-browser/chrome/en-US/locale/en-US/global/viewSource.properties
-lib/tor-browser/chrome/en-US/locale/en-US/global/webapps.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global/wizard.dtd
 lib/tor-browser/chrome/en-US/locale/en-US/global/wizard.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global/xbl.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global/xml/prettyprint.dtd
 lib/tor-browser/chrome/en-US/locale/en-US/global/xslt/xslt.properties
 lib/tor-browser/chrome/en-US/locale/en-US/global/xul.properties
-lib/tor-browser/chrome/en-US/locale/en-US/mozapps/downloads/downloads.dtd
 lib/tor-browser/chrome/en-US/locale/en-US/mozapps/downloads/downloads.properties
 lib/tor-browser/chrome/en-US/locale/en-US/mozapps/downloads/settingsChange.dtd
 lib/tor-browser/chrome/en-US/locale/en-US/mozapps/downloads/unknownContentType.dtd
@@ -2191,9 +2794,6 @@ lib/tor-browser/chrome/en-US/locale/en-U
 lib/tor-browser/chrome/en-US/locale/en-US/mozapps/extensions/extensions.properties
 lib/tor-browser/chrome/en-US/locale/en-US/mozapps/extensions/newaddon.dtd
 lib/tor-browser/chrome/en-US/locale/en-US/mozapps/extensions/newaddon.properties
-lib/tor-browser/chrome/en-US/locale/en-US/mozapps/extensions/selectAddons.dtd
-lib/tor-browser/chrome/en-US/locale/en-US/mozapps/extensions/selectAddons.properties
-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
@@ -2219,50 +2819,44 @@ lib/tor-browser/chrome/en-US/locale/en-U
 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.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/accessibility.js
+lib/tor-browser/chrome/marionette/content/action.js
+lib/tor-browser/chrome/marionette/content/addon.js
+lib/tor-browser/chrome/marionette/content/assert.js
+lib/tor-browser/chrome/marionette/content/atom.js
+lib/tor-browser/chrome/marionette/content/browser.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/cert.js
+lib/tor-browser/chrome/marionette/content/cookie.js
+lib/tor-browser/chrome/marionette/content/dom.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/element.js
 lib/tor-browser/chrome/marionette/content/error.js
-lib/tor-browser/chrome/marionette/content/frame-manager.js
+lib/tor-browser/chrome/marionette/content/evaluate.js
+lib/tor-browser/chrome/marionette/content/event.js
+lib/tor-browser/chrome/marionette/content/format.js
+lib/tor-browser/chrome/marionette/content/interaction.js
+lib/tor-browser/chrome/marionette/content/l10n.js
+lib/tor-browser/chrome/marionette/content/legacyaction.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/navigate.js
+lib/tor-browser/chrome/marionette/content/packets.js
 lib/tor-browser/chrome/marionette/content/proxy.js
-lib/tor-browser/chrome/marionette/content/sendkeys.js
+lib/tor-browser/chrome/marionette/content/reftest.js
+lib/tor-browser/chrome/marionette/content/reftest.xul
 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/pippki/content/pippki/CAOverlay.xul
-lib/tor-browser/chrome/pippki/content/pippki/MineOverlay.xul
-lib/tor-browser/chrome/pippki/content/pippki/OrphanOverlay.xul
-lib/tor-browser/chrome/pippki/content/pippki/OthersOverlay.xul
-lib/tor-browser/chrome/pippki/content/pippki/WebSitesOverlay.xul
-lib/tor-browser/chrome/pippki/content/pippki/certDump.xul
+lib/tor-browser/chrome/marionette/content/session.js
+lib/tor-browser/chrome/marionette/content/stream-utils.js
+lib/tor-browser/chrome/marionette/content/sync.js
+lib/tor-browser/chrome/marionette/content/transport.js
 lib/tor-browser/chrome/pippki/content/pippki/certManager.js
 lib/tor-browser/chrome/pippki/content/pippki/certManager.xul
+lib/tor-browser/chrome/pippki/content/pippki/certViewer.js
 lib/tor-browser/chrome/pippki/content/pippki/certViewer.xul
-lib/tor-browser/chrome/pippki/content/pippki/certpicker.js
-lib/tor-browser/chrome/pippki/content/pippki/certpicker.xul
+lib/tor-browser/chrome/pippki/content/pippki/changepassword.js
 lib/tor-browser/chrome/pippki/content/pippki/changepassword.xul
 lib/tor-browser/chrome/pippki/content/pippki/choosetoken.js
 lib/tor-browser/chrome/pippki/content/pippki/choosetoken.xul
@@ -2276,63 +2870,112 @@ lib/tor-browser/chrome/pippki/content/pi
 lib/tor-browser/chrome/pippki/content/pippki/device_manager.xul
 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.js
 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/exceptionDialog.js
 lib/tor-browser/chrome/pippki/content/pippki/exceptionDialog.xul
+lib/tor-browser/chrome/pippki/content/pippki/load_device.js
 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
 lib/tor-browser/chrome/pippki/content/pippki/protectedAuth.js
 lib/tor-browser/chrome/pippki/content/pippki/protectedAuth.xul
 lib/tor-browser/chrome/pippki/content/pippki/resetpassword.js
 lib/tor-browser/chrome/pippki/content/pippki/resetpassword.xul
+lib/tor-browser/chrome/pippki/content/pippki/setp12password.js
 lib/tor-browser/chrome/pippki/content/pippki/setp12password.xul
-lib/tor-browser/chrome/pippki/content/pippki/viewCertDetails.js
-lib/tor-browser/chrome/pippki/content/pippki/viewCertDetails.xul
 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/dummy.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-browser-content.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-browserSettings.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-c-backgroundPage.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-c-contentScripts.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-c-extension.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-c-identity.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-c-runtime.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-c-storage.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-c-test.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-c-toolkit.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-c-webRequest.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-clipboard.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-contentScripts.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-contextualIdentities.js
 lib/tor-browser/chrome/toolkit/content/extensions/ext-cookies.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-dns.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-downloads.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-identity.js
 lib/tor-browser/chrome/toolkit/content/extensions/ext-idle.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-management.js
 lib/tor-browser/chrome/toolkit/content/extensions/ext-notifications.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-permissions.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-privacy.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-protocolHandlers.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-proxy.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-tabs-base.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-theme.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-toolkit.js
+lib/tor-browser/chrome/toolkit/content/extensions/ext-toolkit.json
+lib/tor-browser/chrome/toolkit/content/extensions/ext-topSites.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/alarms.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/browser_settings.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/clipboard.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/content_scripts.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/contextual_identities.json
 lib/tor-browser/chrome/toolkit/content/extensions/schemas/cookies.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/dns.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/downloads.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/events.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/experiments.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/extension.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/extension_protocol_handlers.json
 lib/tor-browser/chrome/toolkit/content/extensions/schemas/extension_types.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/i18n.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/identity.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/idle.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/management.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/manifest.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/native_manifest.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/notifications.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/permissions.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/privacy.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/proxy.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/runtime.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/storage.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/test.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/theme.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/top_sites.json
+lib/tor-browser/chrome/toolkit/content/extensions/schemas/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/aboutCheckerboard.css
+lib/tor-browser/chrome/toolkit/content/global/aboutCheckerboard.js
+lib/tor-browser/chrome/toolkit/content/global/aboutCheckerboard.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/aboutMozilla.css
 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/aboutPerformance.js
+lib/tor-browser/chrome/toolkit/content/global/aboutPerformance.xhtml
+lib/tor-browser/chrome/toolkit/content/global/aboutProfiles.js
+lib/tor-browser/chrome/toolkit/content/global/aboutProfiles.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
@@ -2341,9 +2984,12 @@ lib/tor-browser/chrome/toolkit/content/g
 lib/tor-browser/chrome/toolkit/content/global/aboutTelemetry.css
 lib/tor-browser/chrome/toolkit/content/global/aboutTelemetry.js
 lib/tor-browser/chrome/toolkit/content/global/aboutTelemetry.xhtml
+lib/tor-browser/chrome/toolkit/content/global/aboutUrlClassifier.css
+lib/tor-browser/chrome/toolkit/content/global/aboutUrlClassifier.js
+lib/tor-browser/chrome/toolkit/content/global/aboutUrlClassifier.xhtml
 lib/tor-browser/chrome/toolkit/content/global/aboutwebrtc/aboutWebrtc.css
+lib/tor-browser/chrome/toolkit/content/global/aboutwebrtc/aboutWebrtc.html
 lib/tor-browser/chrome/toolkit/content/global/aboutwebrtc/aboutWebrtc.js
-lib/tor-browser/chrome/toolkit/content/global/aboutwebrtc/aboutWebrtc.xhtml
 lib/tor-browser/chrome/toolkit/content/global/accessibility/AccessFu.css
 lib/tor-browser/chrome/toolkit/content/global/accessibility/clicked.ogg
 lib/tor-browser/chrome/toolkit/content/global/accessibility/content-script.js
@@ -2355,16 +3001,21 @@ lib/tor-browser/chrome/toolkit/content/g
 lib/tor-browser/chrome/toolkit/content/global/appPicker.js
 lib/tor-browser/chrome/toolkit/content/global/appPicker.xul
 lib/tor-browser/chrome/toolkit/content/global/autocomplete.css
+lib/tor-browser/chrome/toolkit/content/global/backgroundPageThumbs.xhtml
 lib/tor-browser/chrome/toolkit/content/global/backgroundPageThumbsContent.js
 lib/tor-browser/chrome/toolkit/content/global/bindings/autocomplete.xml
 lib/tor-browser/chrome/toolkit/content/global/bindings/browser.xml
 lib/tor-browser/chrome/toolkit/content/global/bindings/button.xml
+lib/tor-browser/chrome/toolkit/content/global/bindings/calendar.js
 lib/tor-browser/chrome/toolkit/content/global/bindings/checkbox.xml
 lib/tor-browser/chrome/toolkit/content/global/bindings/colorpicker.xml
-lib/tor-browser/chrome/toolkit/content/global/bindings/datetimepicker.xml
+lib/tor-browser/chrome/toolkit/content/global/bindings/datekeeper.js
+lib/tor-browser/chrome/toolkit/content/global/bindings/datepicker.js
+lib/tor-browser/chrome/toolkit/content/global/bindings/datetimebox.css
+lib/tor-browser/chrome/toolkit/content/global/bindings/datetimebox.xml
+lib/tor-browser/chrome/toolkit/content/global/bindings/datetimepopup.xml
 lib/tor-browser/chrome/toolkit/content/global/bindings/dialog.xml
 lib/tor-browser/chrome/toolkit/content/global/bindings/editor.xml
-lib/tor-browser/chrome/toolkit/content/global/bindings/expander.xml
 lib/tor-browser/chrome/toolkit/content/global/bindings/filefield.xml
 lib/tor-browser/chrome/toolkit/content/global/bindings/findbar.xml
 lib/tor-browser/chrome/toolkit/content/global/bindings/general.xml
@@ -2375,7 +3026,6 @@ lib/tor-browser/chrome/toolkit/content/g
 lib/tor-browser/chrome/toolkit/content/global/bindings/notification.xml
 lib/tor-browser/chrome/toolkit/content/global/bindings/numberbox.xml
 lib/tor-browser/chrome/toolkit/content/global/bindings/popup.xml
-lib/tor-browser/chrome/toolkit/content/global/bindings/preferences.xml
 lib/tor-browser/chrome/toolkit/content/global/bindings/progressmeter.xml
 lib/tor-browser/chrome/toolkit/content/global/bindings/radio.xml
 lib/tor-browser/chrome/toolkit/content/global/bindings/remote-browser.xml
@@ -2384,12 +3034,14 @@ lib/tor-browser/chrome/toolkit/content/g
 lib/tor-browser/chrome/toolkit/content/global/bindings/scale.xml
 lib/tor-browser/chrome/toolkit/content/global/bindings/scrollbar.xml
 lib/tor-browser/chrome/toolkit/content/global/bindings/scrollbox.xml
-lib/tor-browser/chrome/toolkit/content/global/bindings/spinbuttons.xml
+lib/tor-browser/chrome/toolkit/content/global/bindings/spinner.js
 lib/tor-browser/chrome/toolkit/content/global/bindings/splitter.xml
 lib/tor-browser/chrome/toolkit/content/global/bindings/stringbundle.xml
 lib/tor-browser/chrome/toolkit/content/global/bindings/tabbox.xml
 lib/tor-browser/chrome/toolkit/content/global/bindings/text.xml
 lib/tor-browser/chrome/toolkit/content/global/bindings/textbox.xml
+lib/tor-browser/chrome/toolkit/content/global/bindings/timekeeper.js
+lib/tor-browser/chrome/toolkit/content/global/bindings/timepicker.js
 lib/tor-browser/chrome/toolkit/content/global/bindings/toolbar.xml
 lib/tor-browser/chrome/toolkit/content/global/bindings/toolbarbutton.xml
 lib/tor-browser/chrome/toolkit/content/global/bindings/tree.xml
@@ -2398,37 +3050,24 @@ lib/tor-browser/chrome/toolkit/content/g
 lib/tor-browser/chrome/toolkit/content/global/bindings/wizard.xml
 lib/tor-browser/chrome/toolkit/content/global/browser-child.js
 lib/tor-browser/chrome/toolkit/content/global/browser-content.js
+lib/tor-browser/chrome/toolkit/content/global/buildconfig.css
 lib/tor-browser/chrome/toolkit/content/global/buildconfig.html
 lib/tor-browser/chrome/toolkit/content/global/commonDialog.css
 lib/tor-browser/chrome/toolkit/content/global/commonDialog.js
 lib/tor-browser/chrome/toolkit/content/global/commonDialog.xul
+lib/tor-browser/chrome/toolkit/content/global/components.css
 lib/tor-browser/chrome/toolkit/content/global/config.js
 lib/tor-browser/chrome/toolkit/content/global/config.xul
-lib/tor-browser/chrome/toolkit/content/global/console.css
-lib/tor-browser/chrome/toolkit/content/global/console.js
-lib/tor-browser/chrome/toolkit/content/global/console.xul
-lib/tor-browser/chrome/toolkit/content/global/consoleBindings.xml
+lib/tor-browser/chrome/toolkit/content/global/content-HybridContentTelemetry.js
 lib/tor-browser/chrome/toolkit/content/global/contentAreaUtils.js
-lib/tor-browser/chrome/toolkit/content/global/customizeToolbar.css
-lib/tor-browser/chrome/toolkit/content/global/customizeToolbar.js
-lib/tor-browser/chrome/toolkit/content/global/customizeToolbar.xul
-lib/tor-browser/chrome/toolkit/content/global/devicestorage.properties
-lib/tor-browser/chrome/toolkit/content/global/dialogOverlay.js
-lib/tor-browser/chrome/toolkit/content/global/dialogOverlay.xul
+lib/tor-browser/chrome/toolkit/content/global/datepicker.xhtml
 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
-lib/tor-browser/chrome/toolkit/content/global/findUtils.js
-lib/tor-browser/chrome/toolkit/content/global/finddialog.js
-lib/tor-browser/chrome/toolkit/content/global/finddialog.xul
-lib/tor-browser/chrome/toolkit/content/global/forms.js
 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/gmp-sources/openh264.json
+lib/tor-browser/chrome/toolkit/content/global/gmp-sources/widevinecdm.json
+lib/tor-browser/chrome/toolkit/content/global/l10n.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
@@ -2436,25 +3075,16 @@ lib/tor-browser/chrome/toolkit/content/g
 lib/tor-browser/chrome/toolkit/content/global/mozilla.xhtml
 lib/tor-browser/chrome/toolkit/content/global/netError.xhtml
 lib/tor-browser/chrome/toolkit/content/global/notfound.wav
-lib/tor-browser/chrome/toolkit/content/global/nsClipboard.js
-lib/tor-browser/chrome/toolkit/content/global/nsDragAndDrop.js
-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/preload.js
-lib/tor-browser/chrome/toolkit/content/global/printPageSetup.js
-lib/tor-browser/chrome/toolkit/content/global/printPageSetup.xul
+lib/tor-browser/chrome/toolkit/content/global/preferencesBindings.js
 lib/tor-browser/chrome/toolkit/content/global/printPreviewBindings.xml
 lib/tor-browser/chrome/toolkit/content/global/printPreviewProgress.js
 lib/tor-browser/chrome/toolkit/content/global/printPreviewProgress.xul
 lib/tor-browser/chrome/toolkit/content/global/printProgress.js
 lib/tor-browser/chrome/toolkit/content/global/printProgress.xul
 lib/tor-browser/chrome/toolkit/content/global/printUtils.js
-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
@@ -2463,35 +3093,25 @@ lib/tor-browser/chrome/toolkit/content/g
 lib/tor-browser/chrome/toolkit/content/global/resetProfile.js
 lib/tor-browser/chrome/toolkit/content/global/resetProfile.xul
 lib/tor-browser/chrome/toolkit/content/global/resetProfileProgress.xul
-lib/tor-browser/chrome/toolkit/content/global/select-child.js
 lib/tor-browser/chrome/toolkit/content/global/selectDialog.js
 lib/tor-browser/chrome/toolkit/content/global/selectDialog.xul
-lib/tor-browser/chrome/toolkit/content/global/strres.js
-lib/tor-browser/chrome/toolkit/content/global/svg/svgBindings.xml
+lib/tor-browser/chrome/toolkit/content/global/simplifyMode.css
 lib/tor-browser/chrome/toolkit/content/global/tabprompts.css
 lib/tor-browser/chrome/toolkit/content/global/tabprompts.xml
 lib/tor-browser/chrome/toolkit/content/global/test-ipc.xul
 lib/tor-browser/chrome/toolkit/content/global/textbox.css
+lib/tor-browser/chrome/toolkit/content/global/timepicker.xhtml
 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/unifiedcomplete-top-urls.json
 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
 lib/tor-browser/chrome/toolkit/content/global/viewSourceUtils.js
 lib/tor-browser/chrome/toolkit/content/global/viewZoomOverlay.js
+lib/tor-browser/chrome/toolkit/content/global/win.xul
 lib/tor-browser/chrome/toolkit/content/global/xml/XMLMonoPrint.css
 lib/tor-browser/chrome/toolkit/content/global/xml/XMLPrettyPrint.css
 lib/tor-browser/chrome/toolkit/content/global/xml/XMLPrettyPrint.xml
 lib/tor-browser/chrome/toolkit/content/global/xml/XMLPrettyPrint.xsl
 lib/tor-browser/chrome/toolkit/content/global/xul.css
-lib/tor-browser/chrome/toolkit/content/mozapps/downloads/DownloadProgressListener.js
-lib/tor-browser/chrome/toolkit/content/mozapps/downloads/download.xml
-lib/tor-browser/chrome/toolkit/content/mozapps/downloads/downloads.css
-lib/tor-browser/chrome/toolkit/content/mozapps/downloads/downloads.js
-lib/tor-browser/chrome/toolkit/content/mozapps/downloads/downloads.xul
-lib/tor-browser/chrome/toolkit/content/mozapps/downloads/helperApps.js
 lib/tor-browser/chrome/toolkit/content/mozapps/downloads/unknownContentType.xul
 lib/tor-browser/chrome/toolkit/content/mozapps/extensions/OpenH264-license.txt
 lib/tor-browser/chrome/toolkit/content/mozapps/extensions/about.js
@@ -2506,19 +3126,13 @@ lib/tor-browser/chrome/toolkit/content/m
 lib/tor-browser/chrome/toolkit/content/mozapps/extensions/extensions.js
 lib/tor-browser/chrome/toolkit/content/mozapps/extensions/extensions.xml
 lib/tor-browser/chrome/toolkit/content/mozapps/extensions/extensions.xul
-lib/tor-browser/chrome/toolkit/content/mozapps/extensions/gmpPrefs.xul
-lib/tor-browser/chrome/toolkit/content/mozapps/extensions/list.js
-lib/tor-browser/chrome/toolkit/content/mozapps/extensions/list.xul
 lib/tor-browser/chrome/toolkit/content/mozapps/extensions/newaddon.js
 lib/tor-browser/chrome/toolkit/content/mozapps/extensions/newaddon.xul
+lib/tor-browser/chrome/toolkit/content/mozapps/extensions/pluginPrefs.js
 lib/tor-browser/chrome/toolkit/content/mozapps/extensions/pluginPrefs.xul
-lib/tor-browser/chrome/toolkit/content/mozapps/extensions/selectAddons.css
-lib/tor-browser/chrome/toolkit/content/mozapps/extensions/selectAddons.js
-lib/tor-browser/chrome/toolkit/content/mozapps/extensions/selectAddons.xml
-lib/tor-browser/chrome/toolkit/content/mozapps/extensions/selectAddons.xul
-lib/tor-browser/chrome/toolkit/content/mozapps/extensions/setting.xml
+lib/tor-browser/chrome/toolkit/content/mozapps/extensions/update.css
+lib/tor-browser/chrome/toolkit/content/mozapps/extensions/update.html
 lib/tor-browser/chrome/toolkit/content/mozapps/extensions/update.js
-lib/tor-browser/chrome/toolkit/content/mozapps/extensions/update.xul
 lib/tor-browser/chrome/toolkit/content/mozapps/extensions/updateinfo.xsl
 lib/tor-browser/chrome/toolkit/content/mozapps/handling/dialog.js
 lib/tor-browser/chrome/toolkit/content/mozapps/handling/dialog.xul
@@ -2537,20 +3151,30 @@ lib/tor-browser/chrome/toolkit/content/m
 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/preferences.properties
+lib/tor-browser/chrome/toolkit/content/providers.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/pluginproblem/pluginReplaceBinding.css
+lib/tor-browser/chrome/toolkit/res/accessiblecaret-normal%1.5x.png@localhost
+lib/tor-browser/chrome/toolkit/res/accessiblecaret-normal%1x.png@localhost
+lib/tor-browser/chrome/toolkit/res/accessiblecaret-normal%2.25x.png@localhost
+lib/tor-browser/chrome/toolkit/res/accessiblecaret-normal%2x.png@localhost
+lib/tor-browser/chrome/toolkit/res/accessiblecaret-tilt-left%1.5x.png@localhost
+lib/tor-browser/chrome/toolkit/res/accessiblecaret-tilt-left%1x.png@localhost
+lib/tor-browser/chrome/toolkit/res/accessiblecaret-tilt-left%2.25x.png@localhost
+lib/tor-browser/chrome/toolkit/res/accessiblecaret-tilt-left%2x.png@localhost
+lib/tor-browser/chrome/toolkit/res/accessiblecaret-tilt-right%1.5x.png@localhost
+lib/tor-browser/chrome/toolkit/res/accessiblecaret-tilt-right%1x.png@localhost
+lib/tor-browser/chrome/toolkit/res/accessiblecaret-tilt-right%2.25x.png@localhost
+lib/tor-browser/chrome/toolkit/res/accessiblecaret-tilt-right%2x.png@localhost
 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
@@ -2565,125 +3189,121 @@ lib/tor-browser/chrome/toolkit/res/html.
 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/normandy/Normandy.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/content/AboutPages.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/content/about-studies/about-studies.css
+lib/tor-browser/chrome/toolkit/res/normandy/content/about-studies/about-studies.html
+lib/tor-browser/chrome/toolkit/res/normandy/content/about-studies/about-studies.js
+lib/tor-browser/chrome/toolkit/res/normandy/content/about-studies/common.js
+lib/tor-browser/chrome/toolkit/res/normandy/content/about-studies/img/shield-logo.png
+lib/tor-browser/chrome/toolkit/res/normandy/content/about-studies/shield-studies.js
+lib/tor-browser/chrome/toolkit/res/normandy/content/shield-content-frame.js
+lib/tor-browser/chrome/toolkit/res/normandy/content/shield-content-process.js
+lib/tor-browser/chrome/toolkit/res/normandy/lib/ActionSandboxManager.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/lib/AddonStudies.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/lib/Addons.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/lib/CleanupManager.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/lib/ClientEnvironment.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/lib/EventEmitter.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/lib/FilterExpressions.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/lib/Heartbeat.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/lib/LogManager.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/lib/NormandyApi.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/lib/NormandyDriver.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/lib/PreferenceExperiments.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/lib/PreferenceFilters.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/lib/RecipeRunner.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/lib/Sampling.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/lib/SandboxManager.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/lib/ShieldPreferences.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/lib/Storage.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/lib/TelemetryEvents.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/lib/Uptake.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/lib/Utils.jsm
+lib/tor-browser/chrome/toolkit/res/normandy/skin/osx/Heartbeat.css
+lib/tor-browser/chrome/toolkit/res/normandy/skin/shared/Heartbeat.css
+lib/tor-browser/chrome/toolkit/res/normandy/skin/shared/heartbeat-icon.svg
+lib/tor-browser/chrome/toolkit/res/normandy/skin/shared/heartbeat-star-lit.svg
+lib/tor-browser/chrome/toolkit/res/normandy/skin/shared/heartbeat-star-off.svg
+lib/tor-browser/chrome/toolkit/res/normandy/vendor/LICENSE_THIRDPARTY
+lib/tor-browser/chrome/toolkit/res/normandy/vendor/PropTypes.js
+lib/tor-browser/chrome/toolkit/res/normandy/vendor/React.js
+lib/tor-browser/chrome/toolkit/res/normandy/vendor/ReactDOM.js
+lib/tor-browser/chrome/toolkit/res/normandy/vendor/classnames.js
+lib/tor-browser/chrome/toolkit/res/normandy/vendor/mozjexl.js
 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
 lib/tor-browser/chrome/toolkit/res/ua.css
-lib/tor-browser/chrome/toolkit/res/viewsource.css
-lib/tor-browser/chrome/toolkit/skin/classic/global/Filepicker.png
 lib/tor-browser/chrome/toolkit/skin/classic/global/about.css
 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/aboutLicense.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/aboutRights.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/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
 lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/arrow-dn-hov.gif
-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-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-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
-lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/arrow-up-dis.gif
 lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/arrow-up-hov.gif
-lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/arrow-up-sharp.gif
 lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/arrow-up.gif
-lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/panelarrow-horizontal-themed.svg
 lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/panelarrow-horizontal.svg
-lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/panelarrow-vertical-themed.svg
 lib/tor-browser/chrome/toolkit/skin/classic/global/arrow/panelarrow-vertical.svg
 lib/tor-browser/chrome/toolkit/skin/classic/global/autocomplete.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/button.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/checkbox.css
-lib/tor-browser/chrome/toolkit/skin/classic/global/checkbox/cbox-check-dis.gif
-lib/tor-browser/chrome/toolkit/skin/classic/global/checkbox/cbox-check.gif
 lib/tor-browser/chrome/toolkit/skin/classic/global/colorpicker.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/commonDialog.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/config.css
-lib/tor-browser/chrome/toolkit/skin/classic/global/console/console-error-caret.gif
-lib/tor-browser/chrome/toolkit/skin/classic/global/console/console-error-dash.gif
-lib/tor-browser/chrome/toolkit/skin/classic/global/console/console-toolbar.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/console/console.css
-lib/tor-browser/chrome/toolkit/skin/classic/global/console/console.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/console/itemSelected.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/customizeToolbar.css
-lib/tor-browser/chrome/toolkit/skin/classic/global/datetimepicker.css
+lib/tor-browser/chrome/toolkit/skin/classic/global/datetimeinputpickers.css
+lib/tor-browser/chrome/toolkit/skin/classic/global/datetimepopup.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/dialog.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/dirListing/dirListing.css
-lib/tor-browser/chrome/toolkit/skin/classic/global/dirListing/folder.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/dirListing/local.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/dirListing/remote.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/dirListing/up.png
 lib/tor-browser/chrome/toolkit/skin/classic/global/dropmarker.css
-lib/tor-browser/chrome/toolkit/skin/classic/global/expander.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/filefield.css
-lib/tor-browser/chrome/toolkit/skin/classic/global/filepicker.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/findBar.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/global.css
-lib/tor-browser/chrome/toolkit/skin/classic/global/globalBindings.xml
 lib/tor-browser/chrome/toolkit/skin/classic/global/groupbox.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/icons/Authentication.png
 lib/tor-browser/chrome/toolkit/skin/classic/global/icons/Close.gif
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/Error.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/Landscape.png
 lib/tor-browser/chrome/toolkit/skin/classic/global/icons/Minimize.gif
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/Portrait.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/Print-preview.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/Question.png
 lib/tor-browser/chrome/toolkit/skin/classic/global/icons/Restore.gif
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/Search-close.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/Search-glass.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/Warning.png
-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/arrow-dropdown-12.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/icons/arrow-dropdown-16.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/icons/autoscroll-horizontal.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/icons/autoscroll-vertical.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/icons/autoscroll.svg
 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-inverted.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/close-inverted%2x.png@localhost
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/close.png
+lib/tor-browser/chrome/toolkit/skin/classic/global/icons/blocked.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/icons/calendar-arrow-left.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/icons/calendar-arrow-right.svg
 lib/tor-browser/chrome/toolkit/skin/classic/global/icons/close.svg
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/close%2x.png@localhost
-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-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/folder-item.png
+lib/tor-browser/chrome/toolkit/skin/classic/global/icons/error.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/icons/find-next-arrow.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/icons/find-previous-arrow.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/icons/help.svg
 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/loading-inverted.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/icons/loading-inverted%2x.png@localhost
-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/input-clear.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/icons/loading.png
+lib/tor-browser/chrome/toolkit/skin/classic/global/icons/loading%2x.png@localhost
 lib/tor-browser/chrome/toolkit/skin/classic/global/icons/question-16.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/search-textbox.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/icons/spinner-arrow-down.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/icons/spinner-arrow-up.svg
 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-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/illustrations/about-license.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/illustrations/about-rights.svg
 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
@@ -2691,67 +3311,56 @@ lib/tor-browser/chrome/toolkit/skin/clas
 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/linkTree.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/listbox.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/media/TopLevelImageDocument.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/media/TopLevelVideoDocument.css
-lib/tor-browser/chrome/toolkit/skin/classic/global/media/clicktoplay-bgtexture.png
+lib/tor-browser/chrome/toolkit/skin/classic/global/media/audioMutedButton.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/media/audioNoAudioButton.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/media/audioUnmutedButton.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/media/closedCaptionButton-cc-off.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/media/closedCaptionButton-cc-on.svg
 lib/tor-browser/chrome/toolkit/skin/classic/global/media/error.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/media/fullscreenButton.png
+lib/tor-browser/chrome/toolkit/skin/classic/global/media/fullscreenEnterButton.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/media/fullscreenExitButton.svg
 lib/tor-browser/chrome/toolkit/skin/classic/global/media/imagedoc-darknoise.png
 lib/tor-browser/chrome/toolkit/skin/classic/global/media/imagedoc-lightnoise.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/media/muteButton.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/media/noAudio.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/media/pauseButton.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/media/playButton.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/media/scrubberThumb.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/media/scrubberThumbWide.png
+lib/tor-browser/chrome/toolkit/skin/classic/global/media/pauseButton.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/media/playButton.svg
 lib/tor-browser/chrome/toolkit/skin/classic/global/media/stalled.png
 lib/tor-browser/chrome/toolkit/skin/classic/global/media/throbber.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/media/unmuteButton.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/media/videoClickToPlayButton.svg
 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@localhost
 lib/tor-browser/chrome/toolkit/skin/classic/global/menulist.css
+lib/tor-browser/chrome/toolkit/skin/classic/global/narrate.css
+lib/tor-browser/chrome/toolkit/skin/classic/global/narrate/arrow.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/narrate/back.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/narrate/fast.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/narrate/forward.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/narrate/slow.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/narrate/start.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/narrate/stop.svg
 lib/tor-browser/chrome/toolkit/skin/classic/global/netError.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/notification.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/numberbox.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/passwordmgr.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/popup.css
-lib/tor-browser/chrome/toolkit/skin/classic/global/preferences.css
-lib/tor-browser/chrome/toolkit/skin/classic/global/printPageSetup.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/printPreview.css
-lib/tor-browser/chrome/toolkit/skin/classic/global/printpreview/arrow-left-end.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/printpreview/arrow-left.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/printpreview/arrow-right-end.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/printpreview/arrow-right.png
 lib/tor-browser/chrome/toolkit/skin/classic/global/progressmeter.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/radio.css
-lib/tor-browser/chrome/toolkit/skin/classic/global/radio/radio-check-dis.gif
-lib/tor-browser/chrome/toolkit/skin/classic/global/radio/radio-check.gif
-lib/tor-browser/chrome/toolkit/skin/classic/global/reader/RM-Add-24x24.svg
 lib/tor-browser/chrome/toolkit/skin/classic/global/reader/RM-Close-24x24.svg
-lib/tor-browser/chrome/toolkit/skin/classic/global/reader/RM-Delete-24x24.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/reader/RM-Content-Width-Minus-42x16.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/reader/RM-Content-Width-Plus-44x16.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/reader/RM-Line-Height-Minus-38x14.svg
+lib/tor-browser/chrome/toolkit/skin/classic/global/reader/RM-Line-Height-Plus-38x24.svg
 lib/tor-browser/chrome/toolkit/skin/classic/global/reader/RM-Minus-24x24.svg
 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
-lib/tor-browser/chrome/toolkit/skin/classic/global/scrollbar/slider.gif
 lib/tor-browser/chrome/toolkit/skin/classic/global/scrollbars.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/scrollbox.css
-lib/tor-browser/chrome/toolkit/skin/classic/global/spinbuttons.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/splitter.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/splitter/grip-bottom.gif
 lib/tor-browser/chrome/toolkit/skin/classic/global/splitter/grip-left.gif
@@ -2761,8 +3370,6 @@ lib/tor-browser/chrome/toolkit/skin/clas
 lib/tor-browser/chrome/toolkit/skin/classic/global/tabprompts.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/textbox.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/toolbar.css
-lib/tor-browser/chrome/toolkit/skin/classic/global/toolbar/chevron-inverted.png
-lib/tor-browser/chrome/toolkit/skin/classic/global/toolbar/chevron.gif
 lib/tor-browser/chrome/toolkit/skin/classic/global/toolbar/spring.png
 lib/tor-browser/chrome/toolkit/skin/classic/global/toolbarbutton.css
 lib/tor-browser/chrome/toolkit/skin/classic/global/tree.css
@@ -2774,16 +3381,10 @@ lib/tor-browser/chrome/toolkit/skin/clas
 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/aboutProfiles.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.svg
@@ -2792,137 +3393,93 @@ lib/tor-browser/chrome/toolkit/skin/clas
 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-discover.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-service.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/category-available.svg
+lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/category-discover.svg
+lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/category-legacy.svg
+lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/category-recent.svg
+lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/category-service.svg
+lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric.svg
 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/experimentGeneric.svg
+lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric-16.svg
 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
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/navigation.png
 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/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
+lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/themeGeneric.svg
 lib/tor-browser/chrome/toolkit/skin/classic/mozapps/extensions/utilities.svg
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/formautofill/requestAutocomplete.css
 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/places/defaultFavicon.png
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/places/defaultFavicon%2x.png@localhost
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginActivate.png
+lib/tor-browser/chrome/toolkit/skin/classic/mozapps/places/defaultFavicon.svg
 lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginBlocked.png
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginClose.png
 lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginCrashed.png
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginDisabled.png
-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/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
-lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/pluginGeneric.png
+lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/plugin-blocked.svg
+lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/plugin.svg
+lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/pluginGeneric.svg
 lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/pluginHelp-16.png
 lib/tor-browser/chrome/toolkit/skin/classic/mozapps/plugins/pluginProblem.css
 lib/tor-browser/chrome/toolkit/skin/classic/mozapps/profile/profileSelection.css
 lib/tor-browser/chrome/toolkit/skin/classic/mozapps/profile/profileicon.png
 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/components/ActivityMessageConfigurator.js
-lib/tor-browser/components/ActivityProxy.js
-lib/tor-browser/components/ActivityRequestHandler.js
-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
-lib/tor-browser/components/ContactManager.js
+lib/tor-browser/components/ContentPrefService2.js
 lib/tor-browser/components/ContentProcessSingleton.js
-lib/tor-browser/components/DataReportingService.js
-lib/tor-browser/components/DataStoreImpl.js
 lib/tor-browser/components/DownloadLegacy.js
+lib/tor-browser/components/EditorUtils.js
 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/FxAccountsPush.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
-lib/tor-browser/components/PermissionSettings.js
-lib/tor-browser/components/PhoneNumberService.js
+lib/tor-browser/components/PageIconProtocolHandler.js
+lib/tor-browser/components/PageThumbsStorageService.js
 lib/tor-browser/components/PlacesCategoriesStarter.js
-lib/tor-browser/components/PresentationDeviceInfoManager.js
+lib/tor-browser/components/PresentationControlService.js
+lib/tor-browser/components/PresentationDataChannelSessionTransport.js
 lib/tor-browser/components/PrivateBrowsingTrackingProtectionWhitelist.js
+lib/tor-browser/components/ProcessSelector.js
 lib/tor-browser/components/Push.js
-lib/tor-browser/components/PushClient.js
-lib/tor-browser/components/PushNotificationService.js
+lib/tor-browser/components/PushComponents.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
-lib/tor-browser/components/SiteSpecificUserAgent.js
+lib/tor-browser/components/SecurityReporter.js
 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/TCPPresentationServer.js
 lib/tor-browser/components/TelemetryStartup.js
+lib/tor-browser/components/TooltipTextProvider.js
+lib/tor-browser/components/UAOverridesBootstrapper.js
 lib/tor-browser/components/UnifiedComplete.js
 lib/tor-browser/components/Weave.js
 lib/tor-browser/components/WebVTTParserWrapper.js
-lib/tor-browser/components/Webapps.js
+lib/tor-browser/components/WellKnownOpportunisticUtils.js
 lib/tor-browser/components/XULStore.js
 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/amWebAPI.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/extension-process-script.js
 lib/tor-browser/components/htmlMenuBuilder.js
 lib/tor-browser/components/interfaces.xpt
-lib/tor-browser/components/jsconsole-clhandler.js
-lib/tor-browser/components/marionettecomponent.js
-lib/tor-browser/components/messageWakeupService.js
-lib/tor-browser/components/multiprocessShims.js
+lib/tor-browser/components/marionette.js
+lib/tor-browser/components/mozIntl.js
+lib/tor-browser/components/mozProtocolHandler.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/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-json.js
 lib/tor-browser/components/nsHandlerService.js
 lib/tor-browser/components/nsHelperAppDlg.js
 lib/tor-browser/components/nsINIProcessor.js
@@ -2931,7 +3488,6 @@ lib/tor-browser/components/nsLivemarkSer
 lib/tor-browser/components/nsLoginInfo.js
 lib/tor-browser/components/nsLoginManager.js
 lib/tor-browser/components/nsLoginManagerPrompter.js
-lib/tor-browser/components/nsPlacesAutoComplete.js
 lib/tor-browser/components/nsPlacesExpiration.js
 lib/tor-browser/components/nsPrompter.js
 lib/tor-browser/components/nsSearchService.js
@@ -2949,15 +3505,21 @@ lib/tor-browser/components/recording-cmd
 lib/tor-browser/components/simpleServices.js
 lib/tor-browser/components/storage-json.js
 lib/tor-browser/components/txEXSLTRegExFunctions.js
+lib/tor-browser/contentaccessible/ImageDocument.css
+lib/tor-browser/contentaccessible/TopLevelImageDocument.css
+lib/tor-browser/contentaccessible/TopLevelVideoDocument.css
+lib/tor-browser/contentaccessible/html/folder.png
+lib/tor-browser/contentaccessible/plaintext.css
+lib/tor-browser/contentaccessible/viewsource.css
 lib/tor-browser/defaults/autoconfig/prefcalls.js
 lib/tor-browser/defaults/pref/channel-prefs.js
+lib/tor-browser/defaults/pref/marionette.js
 lib/tor-browser/defaults/pref/services-sync.js
 lib/tor-browser/dependentlibs.list
 lib/tor-browser/dictionaries/en-US.aff
 lib/tor-browser/dictionaries/en-US.dic
-lib/tor-browser/firefox
-lib/tor-browser/firefox-bin
 lib/tor-browser/greprefs.js
+lib/tor-browser/gtk2/libmozgtk.so
 lib/tor-browser/hyphenation/hyph_af.dic
 lib/tor-browser/hyphenation/hyph_bg.dic
 lib/tor-browser/hyphenation/hyph_ca.dic
@@ -2995,21 +3557,18 @@ lib/tor-browser/hyphenation/hyph_sv.dic
 lib/tor-browser/hyphenation/hyph_tr.dic
 lib/tor-browser/hyphenation/hyph_uk.dic
 lib/tor-browser/liblgpllibs.so
+lib/tor-browser/libmozavcodec.so
+lib/tor-browser/libmozavutil.so
+lib/tor-browser/libmozgtk.so
 lib/tor-browser/libmozsqlite3.so
 lib/tor-browser/libxul.so
 lib/tor-browser/modules/AboutReader.jsm
-lib/tor-browser/modules/ActivitiesService.jsm
-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
+lib/tor-browser/modules/AppMenuNotifications.jsm
+lib/tor-browser/modules/AsyncPrefs.jsm
 lib/tor-browser/modules/AsyncShutdown.jsm
-lib/tor-browser/modules/AsyncSpellCheckTestHelper.jsm
-lib/tor-browser/modules/AutoCompleteE10S.jsm
+lib/tor-browser/modules/AutoCompletePopup.jsm
 lib/tor-browser/modules/BackgroundPageThumbs.jsm
 lib/tor-browser/modules/Battery.jsm
 lib/tor-browser/modules/BinarySearch.jsm
@@ -3018,98 +3577,97 @@ lib/tor-browser/modules/BookmarkJSONUtil
 lib/tor-browser/modules/Bookmarks.jsm
 lib/tor-browser/modules/BrowserElementPromptService.jsm
 lib/tor-browser/modules/BrowserUtils.jsm
+lib/tor-browser/modules/CanonicalJSON.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
-lib/tor-browser/modules/CloudSyncBookmarksFolderCache.jsm
-lib/tor-browser/modules/CloudSyncEventSource.jsm
-lib/tor-browser/modules/CloudSyncLocal.jsm
-lib/tor-browser/modules/CloudSyncPlacesWrapper.jsm
-lib/tor-browser/modules/CloudSyncTabs.jsm
+lib/tor-browser/modules/CloudStorage.jsm
 lib/tor-browser/modules/ClusterLib.js
+lib/tor-browser/modules/Color.jsm
 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
-lib/tor-browser/modules/ContentPrefService2.jsm
 lib/tor-browser/modules/ContentPrefServiceChild.jsm
 lib/tor-browser/modules/ContentPrefServiceParent.jsm
 lib/tor-browser/modules/ContentPrefStore.jsm
 lib/tor-browser/modules/ContentPrefUtils.jsm
+lib/tor-browser/modules/ContextualIdentityService.jsm
 lib/tor-browser/modules/CrashMonitor.jsm
 lib/tor-browser/modules/Credentials.jsm
+lib/tor-browser/modules/DOMLocalization.jsm
 lib/tor-browser/modules/DOMRequestHelper.jsm
-lib/tor-browser/modules/DataStoreChangeNotifier.jsm
-lib/tor-browser/modules/DataStoreCursorImpl.jsm
-lib/tor-browser/modules/DataStoreDB.jsm
-lib/tor-browser/modules/DeferredSave.jsm
+lib/tor-browser/modules/DateTimePickerHelper.jsm
 lib/tor-browser/modules/DeferredTask.jsm
 lib/tor-browser/modules/Deprecated.jsm
 lib/tor-browser/modules/DownloadCore.jsm
-lib/tor-browser/modules/DownloadImport.jsm
+lib/tor-browser/modules/DownloadHistory.jsm
 lib/tor-browser/modules/DownloadIntegration.jsm
 lib/tor-browser/modules/DownloadLastDir.jsm
 lib/tor-browser/modules/DownloadList.jsm
 lib/tor-browser/modules/DownloadPaths.jsm
 lib/tor-browser/modules/DownloadStore.jsm
-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/E10SUtils.jsm
+lib/tor-browser/modules/EventEmitter.jsm
 lib/tor-browser/modules/Extension.jsm
+lib/tor-browser/modules/ExtensionChild.jsm
+lib/tor-browser/modules/ExtensionChildDevToolsUtils.jsm
+lib/tor-browser/modules/ExtensionCommon.jsm
 lib/tor-browser/modules/ExtensionContent.jsm
-lib/tor-browser/modules/ExtensionManagement.jsm
+lib/tor-browser/modules/ExtensionPageChild.jsm
+lib/tor-browser/modules/ExtensionParent.jsm
+lib/tor-browser/modules/ExtensionPermissions.jsm
+lib/tor-browser/modules/ExtensionPreferencesManager.jsm
+lib/tor-browser/modules/ExtensionSearchHandler.jsm
+lib/tor-browser/modules/ExtensionSettingsStore.jsm
 lib/tor-browser/modules/ExtensionStorage.jsm
+lib/tor-browser/modules/ExtensionStorageSync.jsm
 lib/tor-browser/modules/ExtensionUtils.jsm
 lib/tor-browser/modules/FileUtils.jsm
+lib/tor-browser/modules/FindContent.jsm
 lib/tor-browser/modules/Finder.jsm
+lib/tor-browser/modules/FinderHighlighter.jsm
+lib/tor-browser/modules/FinderIterator.jsm
 lib/tor-browser/modules/ForgetAboutSite.jsm
-lib/tor-browser/modules/FormAutofill.jsm
-lib/tor-browser/modules/FormAutofillIntegration.jsm
 lib/tor-browser/modules/FormData.jsm
 lib/tor-browser/modules/FormHistory.jsm
-lib/tor-browser/modules/FrameWorker.jsm
-lib/tor-browser/modules/FrameWorkerContent.js
-lib/tor-browser/modules/FreeSpaceWatcher.jsm
+lib/tor-browser/modules/FormLikeFactory.jsm
 lib/tor-browser/modules/FxAccounts.jsm
 lib/tor-browser/modules/FxAccountsClient.jsm
 lib/tor-browser/modules/FxAccountsCommon.js
-lib/tor-browser/modules/FxAccountsOAuthClient.jsm
+lib/tor-browser/modules/FxAccountsConfig.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/GCTelemetry.jsm
+lib/tor-browser/modules/GMPExtractorWorker.js
 lib/tor-browser/modules/GMPInstallManager.jsm
 lib/tor-browser/modules/GMPUtils.jsm
 lib/tor-browser/modules/Geometry.jsm
-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/HybridContentTelemetry.jsm
 lib/tor-browser/modules/ImageObjectProcessor.jsm
-lib/tor-browser/modules/ImportExport.jsm
+lib/tor-browser/modules/IndexedDB.jsm
 lib/tor-browser/modules/IndexedDBHelper.jsm
 lib/tor-browser/modules/InlineSpellChecker.jsm
 lib/tor-browser/modules/InlineSpellCheckerContent.jsm
 lib/tor-browser/modules/InsecurePasswordUtils.jsm
-lib/tor-browser/modules/InterAppCommService.jsm
-lib/tor-browser/modules/Keyboard.jsm
-lib/tor-browser/modules/Langpacks.jsm
+lib/tor-browser/modules/Integration.jsm
+lib/tor-browser/modules/JSONFile.jsm
+lib/tor-browser/modules/L10nRegistry.jsm
+lib/tor-browser/modules/LanguagePrompt.jsm
+lib/tor-browser/modules/LegacyExtensionsUtils.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/Localization.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
@@ -3117,50 +3675,44 @@ lib/tor-browser/modules/LoginManagerCont
 lib/tor-browser/modules/LoginManagerParent.jsm
 lib/tor-browser/modules/LoginRecipes.jsm
 lib/tor-browser/modules/LoginStore.jsm
+lib/tor-browser/modules/Manifest.jsm
 lib/tor-browser/modules/ManifestFinder.jsm
+lib/tor-browser/modules/ManifestIcons.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
-lib/tor-browser/modules/Microformats.js
-lib/tor-browser/modules/MozSocialAPI.jsm
-lib/tor-browser/modules/NativeApp.jsm
+lib/tor-browser/modules/MatchURLFilters.jsm
+lib/tor-browser/modules/Memory.jsm
+lib/tor-browser/modules/MessageChannel.jsm
+lib/tor-browser/modules/MessageContext.jsm
+lib/tor-browser/modules/NLP.jsm
+lib/tor-browser/modules/NativeManifests.jsm
+lib/tor-browser/modules/NativeMessaging.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
 lib/tor-browser/modules/PageMetadata.jsm
 lib/tor-browser/modules/PageThumbUtils.jsm
 lib/tor-browser/modules/PageThumbs.jsm
 lib/tor-browser/modules/PageThumbsWorker.js
-lib/tor-browser/modules/Payment.jsm
 lib/tor-browser/modules/PerfMeasurement.jsm
-lib/tor-browser/modules/PermissionSettings.jsm
-lib/tor-browser/modules/PermissionsInstaller.jsm
-lib/tor-browser/modules/PermissionsTable.jsm
+lib/tor-browser/modules/PerformanceStats-content.js
+lib/tor-browser/modules/PerformanceStats.jsm
+lib/tor-browser/modules/PerformanceWatcher-content.js
+lib/tor-browser/modules/PerformanceWatcher.jsm
 lib/tor-browser/modules/PermissionsUtils.jsm
-lib/tor-browser/modules/PhoneNumber.jsm
-lib/tor-browser/modules/PhoneNumberMetaData.jsm
-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/PlacesSyncUtils.jsm
 lib/tor-browser/modules/PlacesTransactions.jsm
 lib/tor-browser/modules/PlacesUtils.jsm
 lib/tor-browser/modules/PluralForm.jsm
 lib/tor-browser/modules/PopupNotifications.jsm
 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
@@ -3168,58 +3720,45 @@ 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/ProxyScriptContext.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/RemoteController.js
 lib/tor-browser/modules/RemoteFinder.jsm
 lib/tor-browser/modules/RemotePageManager.jsm
 lib/tor-browser/modules/RemoteSecurityUI.jsm
 lib/tor-browser/modules/RemoteWebProgress.jsm
-lib/tor-browser/modules/RequestAutocompleteUI.jsm
-lib/tor-browser/modules/RequestSyncApp.jsm
-lib/tor-browser/modules/RequestSyncService.jsm
-lib/tor-browser/modules/RequestSyncTask.jsm
 lib/tor-browser/modules/ResetProfile.jsm
-lib/tor-browser/modules/ResourceStatsDB.jsm
-lib/tor-browser/modules/ResourceStatsService.jsm
+lib/tor-browser/modules/ResponsivenessMonitor.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
 lib/tor-browser/modules/SearchSuggestionController.jsm
+lib/tor-browser/modules/SecurityInfo.jsm
 lib/tor-browser/modules/SelectContentHelper.jsm
 lib/tor-browser/modules/SelectParentHelper.jsm
+lib/tor-browser/modules/ServiceRequest.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
-lib/tor-browser/modules/SocialService.jsm
-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/Subprocess.jsm
+lib/tor-browser/modules/SyncedBookmarksMirror.jsm
 lib/tor-browser/modules/Task.jsm
 lib/tor-browser/modules/TelemetryArchive.jsm
 lib/tor-browser/modules/TelemetryController.jsm
 lib/tor-browser/modules/TelemetryEnvironment.jsm
+lib/tor-browser/modules/TelemetryHealthPing.jsm
 lib/tor-browser/modules/TelemetryLog.jsm
+lib/tor-browser/modules/TelemetryModules.jsm
 lib/tor-browser/modules/TelemetryReportingPolicy.jsm
 lib/tor-browser/modules/TelemetrySend.jsm
 lib/tor-browser/modules/TelemetrySession.jsm
@@ -3227,28 +3766,25 @@ lib/tor-browser/modules/TelemetryStopwat
 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/UITelemetry.jsm
+lib/tor-browser/modules/UpdatePing.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/WebNavigationFrames.jsm
 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/WebRequestUpload.jsm
 lib/tor-browser/modules/WindowDraggingUtils.jsm
-lib/tor-browser/modules/WorkerAPI.jsm
 lib/tor-browser/modules/XPCOMUtils.jsm
-lib/tor-browser/modules/XPathGenerator.jsm
 lib/tor-browser/modules/ZipUtils.jsm
 lib/tor-browser/modules/accessibility/AccessFu.jsm
 lib/tor-browser/modules/accessibility/Constants.jsm
@@ -3260,10 +3796,9 @@ lib/tor-browser/modules/accessibility/Po
 lib/tor-browser/modules/accessibility/Presentation.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/APIExtensionBootstrap.js
 lib/tor-browser/modules/addons/AddonRepository.jsm
-lib/tor-browser/modules/addons/AddonRepository_SQLiteMigrator.jsm
+lib/tor-browser/modules/addons/AddonSettings.jsm
 lib/tor-browser/modules/addons/AddonUpdateChecker.jsm
 lib/tor-browser/modules/addons/Content.js
 lib/tor-browser/modules/addons/GMPProvider.jsm
@@ -3271,289 +3806,22 @@ lib/tor-browser/modules/addons/Lightweig
 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/XPIInstall.jsm
 lib/tor-browser/modules/addons/XPIProvider.jsm
 lib/tor-browser/modules/addons/XPIProviderUtils.js
-lib/tor-browser/modules/commonjs/dev/debuggee.js
-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
-lib/tor-browser/modules/commonjs/diffpatcher/diff.js
-lib/tor-browser/modules/commonjs/diffpatcher/index.js
-lib/tor-browser/modules/commonjs/diffpatcher/patch.js
-lib/tor-browser/modules/commonjs/diffpatcher/rebase.js
-lib/tor-browser/modules/commonjs/diffpatcher/test/common.js
-lib/tor-browser/modules/commonjs/diffpatcher/test/diff.js
-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/content.jsm
-lib/tor-browser/modules/commonjs/framescript/context-menu.js
-lib/tor-browser/modules/commonjs/framescript/manager.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
-lib/tor-browser/modules/commonjs/sdk/addon/host.js
-lib/tor-browser/modules/commonjs/sdk/addon/installer.js
-lib/tor-browser/modules/commonjs/sdk/addon/manager.js
-lib/tor-browser/modules/commonjs/sdk/addon/runner.js
-lib/tor-browser/modules/commonjs/sdk/addon/window.js
-lib/tor-browser/modules/commonjs/sdk/base64.js
-lib/tor-browser/modules/commonjs/sdk/browser/events.js
-lib/tor-browser/modules/commonjs/sdk/clipboard.js
-lib/tor-browser/modules/commonjs/sdk/console/plain-text.js
-lib/tor-browser/modules/commonjs/sdk/console/traceback.js
-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
-lib/tor-browser/modules/commonjs/sdk/content/worker.js
-lib/tor-browser/modules/commonjs/sdk/context-menu.js
-lib/tor-browser/modules/commonjs/sdk/context-menu/context.js
-lib/tor-browser/modules/commonjs/sdk/context-menu/core.js
-lib/tor-browser/modules/commonjs/sdk/context-menu/readers.js
-lib/tor-browser/modules/commonjs/sdk/context-menu%2.js@localhost
-lib/tor-browser/modules/commonjs/sdk/core/disposable.js
-lib/tor-browser/modules/commonjs/sdk/core/heritage.js
-lib/tor-browser/modules/commonjs/sdk/core/namespace.js
-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/events/assembler.js
-lib/tor-browser/modules/commonjs/sdk/deprecated/sync-worker.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
-lib/tor-browser/modules/commonjs/sdk/event/core.js
-lib/tor-browser/modules/commonjs/sdk/event/dom.js
-lib/tor-browser/modules/commonjs/sdk/event/target.js
-lib/tor-browser/modules/commonjs/sdk/event/utils.js
-lib/tor-browser/modules/commonjs/sdk/frame/hidden-frame.js
-lib/tor-browser/modules/commonjs/sdk/frame/utils.js
-lib/tor-browser/modules/commonjs/sdk/fs/path.js
-lib/tor-browser/modules/commonjs/sdk/hotkeys.js
-lib/tor-browser/modules/commonjs/sdk/indexed-db.js
-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/io/buffer.js
-lib/tor-browser/modules/commonjs/sdk/io/byte-streams.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
-lib/tor-browser/modules/commonjs/sdk/io/text-streams.js
-lib/tor-browser/modules/commonjs/sdk/keyboard/hotkeys.js
-lib/tor-browser/modules/commonjs/sdk/keyboard/observer.js
-lib/tor-browser/modules/commonjs/sdk/keyboard/utils.js
-lib/tor-browser/modules/commonjs/sdk/l10n.js
-lib/tor-browser/modules/commonjs/sdk/l10n/core.js
-lib/tor-browser/modules/commonjs/sdk/l10n/html.js
-lib/tor-browser/modules/commonjs/sdk/l10n/json/core.js
-lib/tor-browser/modules/commonjs/sdk/l10n/loader.js
-lib/tor-browser/modules/commonjs/sdk/l10n/locale.js
-lib/tor-browser/modules/commonjs/sdk/l10n/plural-rules.js
-lib/tor-browser/modules/commonjs/sdk/l10n/prefs.js
-lib/tor-browser/modules/commonjs/sdk/l10n/properties/core.js
-lib/tor-browser/modules/commonjs/sdk/lang/functional.js
-lib/tor-browser/modules/commonjs/sdk/lang/functional/concurrent.js
-lib/tor-browser/modules/commonjs/sdk/lang/functional/core.js
-lib/tor-browser/modules/commonjs/sdk/lang/functional/helpers.js
-lib/tor-browser/modules/commonjs/sdk/lang/type.js
-lib/tor-browser/modules/commonjs/sdk/lang/weak-set.js
-lib/tor-browser/modules/commonjs/sdk/loader/cuddlefish.js
-lib/tor-browser/modules/commonjs/sdk/loader/sandbox.js
-lib/tor-browser/modules/commonjs/sdk/messaging.js
-lib/tor-browser/modules/commonjs/sdk/model/core.js
-lib/tor-browser/modules/commonjs/sdk/net/url.js
-lib/tor-browser/modules/commonjs/sdk/net/xhr.js
-lib/tor-browser/modules/commonjs/sdk/notifications.js
-lib/tor-browser/modules/commonjs/sdk/output/system.js
-lib/tor-browser/modules/commonjs/sdk/page-mod.js
-lib/tor-browser/modules/commonjs/sdk/page-mod/match-pattern.js
-lib/tor-browser/modules/commonjs/sdk/page-worker.js
-lib/tor-browser/modules/commonjs/sdk/panel.js
-lib/tor-browser/modules/commonjs/sdk/panel/events.js
-lib/tor-browser/modules/commonjs/sdk/panel/utils.js
-lib/tor-browser/modules/commonjs/sdk/passwords.js
-lib/tor-browser/modules/commonjs/sdk/passwords/utils.js
-lib/tor-browser/modules/commonjs/sdk/places/bookmarks.js
-lib/tor-browser/modules/commonjs/sdk/places/contract.js
-lib/tor-browser/modules/commonjs/sdk/places/events.js
-lib/tor-browser/modules/commonjs/sdk/places/favicon.js
-lib/tor-browser/modules/commonjs/sdk/places/history.js
-lib/tor-browser/modules/commonjs/sdk/places/host/host-bookmarks.js
-lib/tor-browser/modules/commonjs/sdk/places/host/host-query.js
-lib/tor-browser/modules/commonjs/sdk/places/host/host-tags.js
-lib/tor-browser/modules/commonjs/sdk/places/utils.js
-lib/tor-browser/modules/commonjs/sdk/platform/xpcom.js
-lib/tor-browser/modules/commonjs/sdk/preferences/event-target.js
-lib/tor-browser/modules/commonjs/sdk/preferences/native-options.js
-lib/tor-browser/modules/commonjs/sdk/preferences/service.js
-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
-lib/tor-browser/modules/commonjs/sdk/simple-prefs.js
-lib/tor-browser/modules/commonjs/sdk/simple-storage.js
-lib/tor-browser/modules/commonjs/sdk/stylesheet/style.js
-lib/tor-browser/modules/commonjs/sdk/stylesheet/utils.js
-lib/tor-browser/modules/commonjs/sdk/system.js
-lib/tor-browser/modules/commonjs/sdk/system/child_process.js
-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
-lib/tor-browser/modules/commonjs/sdk/system/runtime.js
-lib/tor-browser/modules/commonjs/sdk/system/unload.js
-lib/tor-browser/modules/commonjs/sdk/system/xul-app.js
-lib/tor-browser/modules/commonjs/sdk/system/xul-app.jsm
-lib/tor-browser/modules/commonjs/sdk/tab/events.js
-lib/tor-browser/modules/commonjs/sdk/tabs.js
-lib/tor-browser/modules/commonjs/sdk/tabs/common.js
-lib/tor-browser/modules/commonjs/sdk/tabs/events.js
-lib/tor-browser/modules/commonjs/sdk/tabs/helpers.js
-lib/tor-browser/modules/commonjs/sdk/tabs/namespace.js
-lib/tor-browser/modules/commonjs/sdk/tabs/observer.js
-lib/tor-browser/modules/commonjs/sdk/tabs/tab-fennec.js
-lib/tor-browser/modules/commonjs/sdk/tabs/tab-firefox.js
-lib/tor-browser/modules/commonjs/sdk/tabs/tab.js
-lib/tor-browser/modules/commonjs/sdk/tabs/tabs-firefox.js
-lib/tor-browser/modules/commonjs/sdk/tabs/utils.js
-lib/tor-browser/modules/commonjs/sdk/tabs/worker.js
-lib/tor-browser/modules/commonjs/sdk/test.js
-lib/tor-browser/modules/commonjs/sdk/test/assert.js
-lib/tor-browser/modules/commonjs/sdk/test/harness.js
-lib/tor-browser/modules/commonjs/sdk/test/httpd.js
-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/utils.js
-lib/tor-browser/modules/commonjs/sdk/timers.js
-lib/tor-browser/modules/commonjs/sdk/ui.js
-lib/tor-browser/modules/commonjs/sdk/ui/button/action.js
-lib/tor-browser/modules/commonjs/sdk/ui/button/contract.js
-lib/tor-browser/modules/commonjs/sdk/ui/button/toggle.js
-lib/tor-browser/modules/commonjs/sdk/ui/button/view.js
-lib/tor-browser/modules/commonjs/sdk/ui/button/view/events.js
-lib/tor-browser/modules/commonjs/sdk/ui/component.js
-lib/tor-browser/modules/commonjs/sdk/ui/frame.js
-lib/tor-browser/modules/commonjs/sdk/ui/frame/model.js
-lib/tor-browser/modules/commonjs/sdk/ui/frame/view.html
-lib/tor-browser/modules/commonjs/sdk/ui/frame/view.js
-lib/tor-browser/modules/commonjs/sdk/ui/id.js
-lib/tor-browser/modules/commonjs/sdk/ui/sidebar.js
-lib/tor-browser/modules/commonjs/sdk/ui/sidebar/actions.js
-lib/tor-browser/modules/commonjs/sdk/ui/sidebar/contract.js
-lib/tor-browser/modules/commonjs/sdk/ui/sidebar/namespace.js
-lib/tor-browser/modules/commonjs/sdk/ui/sidebar/utils.js
-lib/tor-browser/modules/commonjs/sdk/ui/sidebar/view.js
-lib/tor-browser/modules/commonjs/sdk/ui/state.js
-lib/tor-browser/modules/commonjs/sdk/ui/state/events.js
-lib/tor-browser/modules/commonjs/sdk/ui/toolbar.js
-lib/tor-browser/modules/commonjs/sdk/ui/toolbar/model.js
-lib/tor-browser/modules/commonjs/sdk/ui/toolbar/view.js
-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/collection.js
-lib/tor-browser/modules/commonjs/sdk/util/contract.js
-lib/tor-browser/modules/commonjs/sdk/util/deprecate.js
-lib/tor-browser/modules/commonjs/sdk/util/dispatcher.js
-lib/tor-browser/modules/commonjs/sdk/util/list.js
-lib/tor-browser/modules/commonjs/sdk/util/match-pattern.js
-lib/tor-browser/modules/commonjs/sdk/util/object.js
-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/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/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/worker/utils.js
-lib/tor-browser/modules/commonjs/sdk/zip/utils.js
-lib/tor-browser/modules/commonjs/test.js
-lib/tor-browser/modules/commonjs/toolkit/loader.js
-lib/tor-browser/modules/commonjs/toolkit/require.js
+lib/tor-browser/modules/css-selector.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/Loader.jsm
-lib/tor-browser/modules/devtools/Simulator.jsm
-lib/tor-browser/modules/devtools/dbg-client.jsm
-lib/tor-browser/modules/devtools/dbg-server.jsm
-lib/tor-browser/modules/devtools/event-emitter.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
-lib/tor-browser/modules/identity/IdentityStore.jsm
-lib/tor-browser/modules/identity/IdentityUtils.jsm
-lib/tor-browser/modules/identity/LogUtils.jsm
-lib/tor-browser/modules/identity/MinimalIdentity.jsm
-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
 lib/tor-browser/modules/media/RTCStatsReport.jsm
+lib/tor-browser/modules/microformat-shiv.js
+lib/tor-browser/modules/narrate/NarrateControls.jsm
+lib/tor-browser/modules/narrate/Narrator.jsm
+lib/tor-browser/modules/narrate/VoiceSelect.jsm
 lib/tor-browser/modules/nsFormAutoCompleteResult.jsm
 lib/tor-browser/modules/osfile.jsm
 lib/tor-browser/modules/osfile/osfile_async_front.jsm
@@ -3564,106 +3832,93 @@ lib/tor-browser/modules/osfile/osfile_sh
 lib/tor-browser/modules/osfile/osfile_unix_allthreads.jsm
 lib/tor-browser/modules/osfile/osfile_unix_back.jsm
 lib/tor-browser/modules/osfile/osfile_unix_front.jsm
-lib/tor-browser/modules/osfile/osfile_win_allthreads.jsm
-lib/tor-browser/modules/osfile/osfile_win_back.jsm
-lib/tor-browser/modules/osfile/osfile_win_front.jsm
 lib/tor-browser/modules/osfile/ospath.jsm
 lib/tor-browser/modules/osfile/ospath_unix.jsm
 lib/tor-browser/modules/osfile/ospath_win.jsm
+lib/tor-browser/modules/presentation/ControllerStateMachine.jsm
+lib/tor-browser/modules/presentation/ReceiverStateMachine.jsm
+lib/tor-browser/modules/presentation/StateMachineHelper.jsm
 lib/tor-browser/modules/reader/JSDOMParser.js
 lib/tor-browser/modules/reader/Readability.js
 lib/tor-browser/modules/reader/ReaderWorker.js
 lib/tor-browser/modules/reader/ReaderWorker.jsm
 lib/tor-browser/modules/reflect.jsm
-lib/tor-browser/modules/sdk/bootstrap.js
-lib/tor-browser/modules/sdk/system/Startup.js
 lib/tor-browser/modules/services-common/async.js
-lib/tor-browser/modules/services-common/bagheeraclient.js
+lib/tor-browser/modules/services-common/blocklist-clients.js
+lib/tor-browser/modules/services-common/blocklist-updater.js
 lib/tor-browser/modules/services-common/hawkclient.js
 lib/tor-browser/modules/services-common/hawkrequest.js
+lib/tor-browser/modules/services-common/kinto-http-client.js
+lib/tor-browser/modules/services-common/kinto-offline-client.js
+lib/tor-browser/modules/services-common/kinto-storage-adapter.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/stringbundle.js
 lib/tor-browser/modules/services-common/tokenserverclient.js
+lib/tor-browser/modules/services-common/uptake-telemetry.js
 lib/tor-browser/modules/services-common/utils.js
 lib/tor-browser/modules/services-crypto/WeaveCrypto.js
+lib/tor-browser/modules/services-crypto/jwcrypto.jsm
 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/UIState.jsm
 lib/tor-browser/modules/services-sync/addonsreconciler.js
 lib/tor-browser/modules/services-sync/addonutils.js
+lib/tor-browser/modules/services-sync/bookmark_repair.js
+lib/tor-browser/modules/services-sync/bookmark_validator.js
 lib/tor-browser/modules/services-sync/browserid_identity.js
+lib/tor-browser/modules/services-sync/collection_repair.js
+lib/tor-browser/modules/services-sync/collection_validator.js
 lib/tor-browser/modules/services-sync/constants.js
+lib/tor-browser/modules/services-sync/doctor.js
 lib/tor-browser/modules/services-sync/engines.js
 lib/tor-browser/modules/services-sync/engines/addons.js
 lib/tor-browser/modules/services-sync/engines/bookmarks.js
 lib/tor-browser/modules/services-sync/engines/clients.js
+lib/tor-browser/modules/services-sync/engines/extension-storage.js
 lib/tor-browser/modules/services-sync/engines/forms.js
 lib/tor-browser/modules/services-sync/engines/history.js
 lib/tor-browser/modules/services-sync/engines/passwords.js
 lib/tor-browser/modules/services-sync/engines/prefs.js
 lib/tor-browser/modules/services-sync/engines/tabs.js
-lib/tor-browser/modules/services-sync/healthreport.jsm
-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/policies.js
 lib/tor-browser/modules/services-sync/record.js
 lib/tor-browser/modules/services-sync/resource.js
-lib/tor-browser/modules/services-sync/rest.js
 lib/tor-browser/modules/services-sync/service.js
-lib/tor-browser/modules/services-sync/stages/cluster.js
 lib/tor-browser/modules/services-sync/stages/declined.js
 lib/tor-browser/modules/services-sync/stages/enginesync.js
 lib/tor-browser/modules/services-sync/status.js
-lib/tor-browser/modules/services-sync/userapi.js
+lib/tor-browser/modules/services-sync/telemetry.js
 lib/tor-browser/modules/services-sync/util.js
-lib/tor-browser/modules/services/datareporting/policy.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
-lib/tor-browser/modules/services/metrics/dataprovider.jsm
-lib/tor-browser/modules/services/metrics/providermanager.jsm
-lib/tor-browser/modules/services/metrics/storage.jsm
-lib/tor-browser/modules/sqlite/sqlite_internal.js
+lib/tor-browser/modules/sessionstore/PrivacyLevel.jsm
+lib/tor-browser/modules/sessionstore/SessionHistory.jsm
+lib/tor-browser/modules/sessionstore/Utils.jsm
+lib/tor-browser/modules/subprocess/subprocess_common.jsm
+lib/tor-browser/modules/subprocess/subprocess_shared.js
+lib/tor-browser/modules/subprocess/subprocess_shared_unix.js
+lib/tor-browser/modules/subprocess/subprocess_unix.jsm
+lib/tor-browser/modules/subprocess/subprocess_worker_common.js
+lib/tor-browser/modules/subprocess/subprocess_worker_unix.js
+lib/tor-browser/modules/third_party/jsesc/jsesc.js
 lib/tor-browser/modules/vtt.jsm
 lib/tor-browser/modules/workers/PromiseWorker.js
 lib/tor-browser/modules/workers/require.js
+lib/tor-browser/pingsender
 lib/tor-browser/platform.ini
 lib/tor-browser/plugin-container
 lib/tor-browser/removed-files
 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@localhost
-lib/tor-browser/res/accessiblecaret%2.25x.png@localhost
-lib/tor-browser/res/accessiblecaret%2x.png@localhost
-lib/tor-browser/res/accessiblecaret_tilt_left.png
-lib/tor-browser/res/accessiblecaret_tilt_left%1.5x.png@localhost
-lib/tor-browser/res/accessiblecaret_tilt_left%2.25x.png@localhost
-lib/tor-browser/res/accessiblecaret_tilt_left%2x.png@localhost
-lib/tor-browser/res/accessiblecaret_tilt_right.png
-lib/tor-browser/res/accessiblecaret_tilt_right%1.5x.png@localhost
-lib/tor-browser/res/accessiblecaret_tilt_right%2.25x.png@localhost
-lib/tor-browser/res/accessiblecaret_tilt_right%2x.png@localhost
 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/mathml20.properties
 lib/tor-browser/res/fonts/mathfont.properties
 lib/tor-browser/res/fonts/mathfontSTIXGeneral.properties
 lib/tor-browser/res/fonts/mathfontUnicode.properties
 lib/tor-browser/res/grabber.gif
-lib/tor-browser/res/html/folder.png
 lib/tor-browser/res/language.properties
+lib/tor-browser/res/multilocale.txt
 lib/tor-browser/res/svg.css
 lib/tor-browser/res/table-add-column-after-active.gif
 lib/tor-browser/res/table-add-column-after-hover.gif
@@ -3683,53 +3938,8 @@ lib/tor-browser/res/table-remove-column.
 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@localhost
-lib/tor-browser/res/text_caret%2.25x.png@localhost
-lib/tor-browser/res/text_caret%2x.png@localhost
-lib/tor-browser/res/text_caret_tilt_left.png
-lib/tor-browser/res/text_caret_tilt_left%1.5x.png@localhost
-lib/tor-browser/res/text_caret_tilt_left%2.25x.png@localhost
-lib/tor-browser/res/text_caret_tilt_left%2x.png@localhost
-lib/tor-browser/res/text_caret_tilt_right.png
-lib/tor-browser/res/text_caret_tilt_right%1.5x.png@localhost
-lib/tor-browser/res/text_caret_tilt_right%2.25x.png@localhost
-lib/tor-browser/res/text_caret_tilt_right%2x.png@localhost
-lib/tor-browser/run-mozilla.sh
-lib/tor-browser/webapprt-stub
-lib/tor-browser/webapprt/chrome.manifest
-lib/tor-browser/webapprt/chrome/chrome.manifest
-lib/tor-browser/webapprt/chrome/en-US/locale/webapprt/appstrings.properties
-lib/tor-browser/webapprt/chrome/en-US/locale/webapprt/dom.properties
-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/downloads/download.xml
-lib/tor-browser/webapprt/chrome/webapprt/content/downloads/downloads.css
-lib/tor-browser/webapprt/chrome/webapprt/content/downloads/downloads.js
-lib/tor-browser/webapprt/chrome/webapprt/content/downloads/downloads.xul
-lib/tor-browser/webapprt/chrome/webapprt/content/getUserMediaDialog.js
-lib/tor-browser/webapprt/chrome/webapprt/content/getUserMediaDialog.xul
-lib/tor-browser/webapprt/chrome/webapprt/content/mochitest-shared.js
-lib/tor-browser/webapprt/chrome/webapprt/content/mochitest.js
-lib/tor-browser/webapprt/chrome/webapprt/content/mochitest.xul
-lib/tor-browser/webapprt/chrome/webapprt/content/webapp.js
-lib/tor-browser/webapprt/chrome/webapprt/content/webapp.xul
-lib/tor-browser/webapprt/chrome/webapprt/skin/classic/webapprt/downloads/downloadButtons.png
-lib/tor-browser/webapprt/chrome/webapprt/skin/classic/webapprt/downloads/downloadIcon.png
-lib/tor-browser/webapprt/chrome/webapprt/skin/classic/webapprt/downloads/downloads.css
-lib/tor-browser/webapprt/components/CommandLineHandler.js
-lib/tor-browser/webapprt/components/ContentPermission.js
-lib/tor-browser/webapprt/components/DirectoryProvider.js
-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/Startup.jsm
-lib/tor-browser/webapprt/modules/WebRTCHandler.jsm
-lib/tor-browser/webapprt/modules/WebappManager.jsm
-lib/tor-browser/webapprt/modules/WebappRT.jsm
-lib/tor-browser/webapprt/webapprt.ini
+lib/tor-browser/tor-browser
+lib/tor-browser/tor-browser-bin
 share/applications/tor-browser.desktop
 share/pixmaps/tor-browser.png
+@pkgdir bin

Index: pkgsrc/security/tor-browser/distinfo
diff -u pkgsrc/security/tor-browser/distinfo:1.5 pkgsrc/security/tor-browser/distinfo:1.6
--- pkgsrc/security/tor-browser/distinfo:1.5    Sun Jan 22 12:27:21 2017
+++ pkgsrc/security/tor-browser/distinfo        Mon Feb 25 15:32:23 2019
@@ -1,147 +1,48 @@
-$NetBSD: distinfo,v 1.5 2017/01/22 12:27:21 ryoon Exp $
+$NetBSD: distinfo,v 1.6 2019/02/25 15:32:23 wiz Exp $
 
-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-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) = 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) = 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_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) = 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_moz.build) = a98bda4727538f4a0f09a20b84f9dd883edaf7d9
-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) = 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__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) = 6c98bbecde21b8571c71477f351488d9a3da45f3
-SHA1 (patch-ipc_chromium_src_base_process__util.h) = 4b24c3467866a601d68bb83f44e5fd38fb27188d
-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) = 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_StringUtil.cpp) = f238adebb5bdf57f7109a781c6f3fb195763f3c0
-SHA1 (patch-ipc_glue_moz.build) = 5c3f99ede7ab2d8ad58e92b31576971de87cb528
-SHA1 (patch-js__src__vm__SPSProfiler.cpp) = 989ba25e4c5308d21d07baa802decce13609a475
-SHA1 (patch-js_src_ctypes_CTypes.h) = 768a084239f92a424c1c7dc9eaaf9be9456ca9f0
-SHA1 (patch-js_src_frontend_ParseMaps.cpp) = c00117d79b78904bc50a1d664a8fc0e4e339bfbc
-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) = 2502ae2b4e6103788c2a888b6cb19cedf9d2976f
-SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde
-SHA1 (patch-js_xpconnect_src_xpcprivate.h) = 8a15ff542c9d3fce448d9ec63706f7dfb411d926
-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) = 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) = 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) = 2e6f125ae50125a1fff7197e42f3a61b92e0fcfc
-SHA1 (patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h) = de7055f891387f96f8fd32366c7189d480354e9e
-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_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) = 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_Attributes.h) = bf3378667704d7c9194b00024bb51ed23fd92286
-SHA1 (patch-mfbt_Poison.cpp) = f502581db96b3e5eca25a9aa9035f436e9167503
-SHA1 (patch-modules_libjar_nsZipArchive.cpp) = 6aff0f8ed42575d8ca36a524e12e9a1f7351004a
-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) = 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-webapprt_moz.build) = 177468d5e12c49db1ad5376f0f3df34fa9df070c
-SHA1 (patch-xpcom_base_nscore.h) = f4fe66cc9e714a2101a4d1287359d1c300574438
-SHA1 (patch-xpcom_build_PoisonIOInterposer.h) = b0a53ec580bf5c2277d19618c1240a447575ae68
-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
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp) = 8cb72e1bc9a38e3f123539d7bb2aca6793f2b574
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp) = b6dc5d54eeaa908d914116429e61f4b65a6a5f8e
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp) = 71a33723a557a6153405f6baec8404b25f841608
+SHA1 (tor-browser-60.5.1esr-8.5-1-build2.tar.gz) = fa8bea5f006a4a024240c7332ac8cc622320c002
+RMD160 (tor-browser-60.5.1esr-8.5-1-build2.tar.gz) = 17d4dda39fcee5e305b1c3a40938369c677bfa07
+SHA512 (tor-browser-60.5.1esr-8.5-1-build2.tar.gz) = 33f17c35a6effe152317056bdab9a00f07da278db6caee65422b5fa28c205ff901da4dbe7ca6ac99cf4122fd568fbb6921402826773f6972ff9f9d91f00bb5f4
+Size (tor-browser-60.5.1esr-8.5-1-build2.tar.gz) = 388485413 bytes
+SHA1 (patch-.mozconfig) = 3377e91db2560d79503e9a9dd69011f5a84b6994
+SHA1 (patch-aa) = fdabcc9b055f6439fdbda9b38ab7cec08ff3e231
+SHA1 (patch-browser_app_profile_firefox.js) = 9a43095d94f83f315b9a3ce4a7b0a4301e9c40e6
+SHA1 (patch-build_moz.configure_old.configure) = 1df6867eaf73a350fbe8fcd5bd34e1fcab09d707
+SHA1 (patch-build_moz.configure_rust.configure) = 2818454ba4df3cbd85174edc4828206b3bf0a82b
+SHA1 (patch-dom_fetch_FetchConsumer.cpp) = 784a1e236cd7927726f13a50b72218ded142cc53
+SHA1 (patch-dom_media_CubebUtils.cpp) = b9ef14e863f7eb5fb8e3caf3813dc28dea66ff7a
+SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = f1d0adae2873545818072adb4e8599267bc4e6c5
+SHA1 (patch-gfx_webrender_src_query.rs) = 6434b0fc1d6441ddb555a2a3b199564b488ec336
+SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = 4a1b34bd0036ebd7bfd22a4cc71034c0d40bbeb8
+SHA1 (patch-ipc_chromium_src_base_lock__impl__posix.cc) = 16e37fe54ba1d8d233f6b04dbd06e248305d7f6e
+SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 2f7fce38e1c68bb39e30f0fe4fa5c5e58809dcd0
+SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = ee1e2d1c83d3c6e5d845031c4b20e9d79de5532e
+SHA1 (patch-ipc_glue_CrossProcessSemaphore.h) = 778a569887d8ad082abc2fa2fe89a0a943e84d64
+SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = 5b3bde8ff281f444b82a2094bd3ba82974d40cc7
+SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836
+SHA1 (patch-js_src_gc_Memory.cpp) = b69e841d3e4edfd50c387e374e63186721c24cc7
+SHA1 (patch-js_src_threading_posix_Thread.cpp) = 47e612a676e614fd6dd43b8a3140218a3fbdc7fa
+SHA1 (patch-js_src_util_NativeStack.cpp) = 3da5b544b28434a4b1e13e9a5ec47fb6ac7149c7
+SHA1 (patch-js_src_wasm_WasmSignalHandlers.cpp) = c2a4f0bf52bbd95ca66319f65662840f2411d080
+SHA1 (patch-media_libcubeb_gtest_moz.build) = 921a001726cda9e9782df5e59ae02b19d76ef47e
+SHA1 (patch-media_libcubeb_src_cubeb.c) = 1b1b8d57eb710cad13518ded79a0ddee2681881b
+SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 3ee36f58bb525767c7d2b9e814ba4ccaa4868717
+SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = ccd7ad6f09977dab358632107cfd9078b4649f99
+SHA1 (patch-media_libcubeb_src_moz.build) = f243068c8908dcb16434221edef8c65db3bb0c83
+SHA1 (patch-media_libcubeb_update.sh) = 3a322de06bbe9aafba9da349954ef022bd094992
+SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc
+SHA1 (patch-media_libyuv_libyuv_source_mjpeg__decoder.cc) = 8a264c439fa4749cd7c5acf96e1ae3f9bae0a886
+SHA1 (patch-media_webrtc_trunk_webrtc_modules_audio__device_linux_audio__device__alsa__linux.cc) = 91e8ce496c1f4dbbd0a463d83cb033afd1de3f49
+SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 0141dd1372c13ea1fce6e2f5ffb65e0cb0f3a13e
+SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = a69bc7b7096b410582e725f9dbec57fee90d6686
+SHA1 (patch-modules_pdfium_update.sh) = b0bf091325c9322c54880de067871354cd689038
+SHA1 (patch-servo_components_style_build__gecko.rs) = fca2260a70b496fc010f165ff4d68788b7e28632
+SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 5b6d2e5c9f685d32894898d3ef3aec09a1a1e5ce
+SHA1 (patch-toolkit_library_moz.build) = ecb6125e996d5496335c58ecd3433ad3214f29f0
+SHA1 (patch-toolkit_moz.configure) = 40ee147cc1d2c62dd6c83b3f67ce9e61f758ea57
+SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 6f557fb732f0b9dabf059ffac0400d3db4e79e47
+SHA1 (patch-toolkit_xre_glxtest.cpp) = 6e7e7717e2ecf28860e87261e046ef180eac0807
+SHA1 (patch-xpcom_base_nscore.h) = fef62ceffed0896db1c41972fd96d5dd36b7de37
+SHA1 (patch-xpcom_build_BinaryPath.h) = df4735f7e9ead61b1f98e057c0b679caf174f4c8
+SHA1 (patch-xpcom_io_TorFileUtils.cpp) = c23d867b5a97a4c169198831b816b1bcef8dc630
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp) = 0792c2c626d906e71c5183994cb32bf8cdb3e239
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp) = 3a902eb9a23b3b5737f3c8cb5f96a5ad9a98a189
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S) = 79a4686d368132aff804f217baa685b2e06bc396
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s) = 522bc237bc90d85c98b61a467a431fddd91d8c3c
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp) = d246f0695eb43d43bfd5571297945a4b7a88f72c
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp) = 75db49c9cb6bf2993afba82b731d80389d866212
-SHA1 (patch-xulrunner_installer_Makefile.in) = 9d32ff87d0962c0406ed38de995c0350dd372e49

Index: pkgsrc/security/tor-browser/patches/patch-aa
diff -u pkgsrc/security/tor-browser/patches/patch-aa:1.2 pkgsrc/security/tor-browser/patches/patch-aa:1.3
--- pkgsrc/security/tor-browser/patches/patch-aa:1.2    Sun Jan 22 12:27:21 2017
+++ pkgsrc/security/tor-browser/patches/patch-aa        Mon Feb 25 15:32:24 2019
@@ -1,50 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2017/01/22 12:27:21 ryoon Exp $
+$NetBSD: patch-aa,v 1.3 2019/02/25 15:32:24 wiz Exp $
 
---- configure.in.orig  2017-01-22 03:59:19.858941700 +0000
-+++ configure.in
-@@ -1746,7 +1746,7 @@ fi
- dnl ========================================================
- dnl SPS Profiler
- dnl ========================================================
--MOZ_ENABLE_PROFILER_SPS=1
-+MOZ_ENABLE_PROFILER_SPS=
- 
- 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
-@@ -2574,8 +2573,7 @@ MOZ_CXX11
- 
- AC_LANG_C
- 
--dnl Check for .hidden assembler directive and visibility attribute.
--dnl Borrowed from glibc configure.in
-+dnl Setup default hidden visibility and wrapped system headers.
- dnl ===============================================================
- if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then
-   AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
-@@ -3467,6 +3465,14 @@ if test -n "$YASM"; then
-   _YASM_BUILD=`        echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
- fi
- 
-+if test -n "${LIBXUL_SDK_DIR}"; then
-+    AC_MSG_WARN([pkgsrc: LIBXUL_SDK_DIR is set; assuming we want nss and nspr from xulrunner.])
-+    NSPR_CFLAGS="-I${prefix}/include/xulrunner/unstable `pkg-config --cflags nspr`"
-+    NSPR_LIBS="`pkg-config --libs nspr`"
-+    NSS_CFLAGS="`pkg-config --cflags nss`"
-+    NSS_LIBS="`pkg-config --libs nss`"
-+fi
-+
- if test -z "$SKIP_LIBRARY_CHECKS"; then
- dnl system JPEG support
- dnl ========================================================
-@@ -3494,11 +3500,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
+* Disable libjpeg-turbo check
+* Add system libraries option
+* Add OSS audio support
+
+--- old-configure.in.orig      2018-05-03 16:58:31.000000000 +0000
++++ old-configure.in
+@@ -1804,11 +1804,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then
                       #include <jpeglib.h> ],
                     [ #if JPEG_LIB_VERSION < $MOZJPEG
                       #error "Insufficient JPEG library version ($MOZJPEG required)."
@@ -54,174 +16,10 @@ $NetBSD: patch-aa,v 1.2 2017/01/22 12:27
 -                     #endif
 -                     ],
 +                     #endif ],
-                    MOZ_NATIVE_JPEG=1,
+                    MOZ_SYSTEM_JPEG=1,
                     AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
  fi
-@@ -4255,6 +4257,10 @@ cairo-gonk)
- 
- esac
- 
-+if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
-+   AC_DEFINE(XP_MACOSX)
-+fi
-+
- AC_SUBST(MOZ_PDF_PRINTING)
- if test "$MOZ_PDF_PRINTING"; then
-    PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
-@@ -5013,6 +5019,9 @@ if test -n "$MOZ_WEBRTC"; then
-     MOZ_VPX=1
-     MOZ_VPX_ERROR_CONCEALMENT=1
- 
-+    dnl with libv4l2 we can support more cameras
-+    PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)
-+
- dnl enable once Signaling lands
-     MOZ_WEBRTC_SIGNALING=1
-     AC_DEFINE(MOZ_WEBRTC_SIGNALING)
-@@ -5156,6 +5165,142 @@ if test "${ac_cv_c_attribute_aligned}" !
- fi
- 
- dnl ========================================================
-+dnl Check for libogg
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-ogg,
-+[  --with-system-ogg       Use system libogg (located with pkgconfig)],
-+MOZ_NATIVE_OGG=1,
-+MOZ_NATIVE_OGG=)
-+
-+if test -n "$MOZ_NATIVE_OGG"; then
-+    PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1)
-+
-+    _SAVE_LIBS=$LIBS
-+    LIBS="$LIBS $MOZ_OGG_LIBS"
-+    AC_CHECK_FUNC(ogg_set_mem_functions, [],
-+      [AC_DEFINE(MOZ_OGG_NO_MEM_REPORTING)])
-+    LIBS=$_SAVE_LIBS
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_OGG)
-+
-+dnl ========================================================
-+dnl Check for libvorbis
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-vorbis,
-+[  --with-system-vorbis    Use system libvorbis (located with pkgconfig)],
-+MOZ_NATIVE_VORBIS=1,
-+MOZ_NATIVE_VORBIS=)
-+
-+if test -n "$MOZ_NATIVE_VORBIS"; then
-+    PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5)
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_VORBIS)
-+
-+dnl ========================================================
-+dnl Check for integer-only libvorbis aka tremor
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-tremor,
-+[  --with-system-tremor    Use system libtremor (located with pkgconfig)],
-+MOZ_NATIVE_TREMOR=1,
-+MOZ_NATIVE_TREMOR=)
-+
-+if test -n "$MOZ_NATIVE_TREMOR"; then
-+    PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1)
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_TREMOR)
-+
-+dnl ========================================================
-+dnl Check for libcelt
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-celt,
-+[  --with-system-celt      Use system libcelt (located with pkgconfig)],
-+MOZ_NATIVE_CELT=1,
-+MOZ_NATIVE_CELT=)
-+
-+if test -n "$MOZ_NATIVE_CELT"; then
-+    PKG_CHECK_MODULES(MOZ_CELT, celt)
-+else
-+    MOZ_CELT_CFLAGS='-I$(topsrcdir)/media/libopus'
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_CELT)
-+
-+dnl ========================================================
-+dnl Check for libopus
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-opus,
-+[  --with-system-opus      Use system libopus (located with pkgconfig)],
-+MOZ_NATIVE_OPUS=1,
-+MOZ_NATIVE_OPUS=)
-+
-+if test -n "$MOZ_NATIVE_OPUS"; then
-+    PKG_CHECK_MODULES(MOZ_OPUS, opus >= 1.1)
-+else
-+    MOZ_OPUS_CFLAGS='-I$(topsrcdir)/media/libopus/include'
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_OPUS)
-+
-+dnl ========================================================
-+dnl Check for libtheora
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-theora,
-+[  --with-system-theora    Use system libtheora (located with pkgconfig)],
-+MOZ_NATIVE_THEORA=1,
-+MOZ_NATIVE_THEORA=)
-+
-+if test -n "$MOZ_NATIVE_THEORA"; then
-+    PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2)
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_THEORA)
-+
-+dnl ========================================================
-+dnl Check for libsoundtouch
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-soundtouch,
-+[  --with-system-soundtouch Use system libsoundtouch (located with pkgconfig)],
-+MOZ_NATIVE_SOUNDTOUCH=1,
-+MOZ_NATIVE_SOUNDTOUCH=)
-+
-+if test -n "$MOZ_NATIVE_SOUNDTOUCH"; then
-+    PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.8.0)
-+
-+    AC_LANG_SAVE
-+    AC_LANG_CPLUSPLUS
-+    _SAVE_CXXFLAGS=$CXXFLAGS
-+    CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS"
-+    AC_CACHE_CHECK(for soundtouch sample type,
-+                   ac_cv_soundtouch_sample_type,
-+                   [AC_TRY_COMPILE([#include <SoundTouch.h>
-+                                    #ifndef SOUNDTOUCH_INTEGER_SAMPLES
-+                                    #error soundtouch expects float samples
-+                                    #endif],
-+                                   [],
-+                                   [ac_cv_soundtouch_sample_type=short],
-+                                   [ac_cv_soundtouch_sample_type=float])])
-+    CXXFLAGS=$_SAVE_CXXFLAGS
-+    AC_LANG_RESTORE
-+
-+    if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \
-+         -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then
-+        AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove 
--with-system-soundtouch.])
-+    fi
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_SOUNDTOUCH)
-+
-+dnl ========================================================
- dnl = Disable VP8 decoder support
- dnl ========================================================
- MOZ_ARG_DISABLE_BOOL(webm,
-@@ -5558,6 +5703,67 @@ fi
+@@ -2596,6 +2592,67 @@ AC_DEFINE(MOZ_WEBM_ENCODER)
  AC_SUBST(MOZ_WEBM_ENCODER)
  
  dnl ==================================
@@ -230,7 +28,7 @@ $NetBSD: patch-aa,v 1.2 2017/01/22 12:27
 +
 +dnl If using Linux, Solaris or BSDs, ensure that OSS is available
 +case "$OS_TARGET" in
-+Linux|SunOS|DragonFly|FreeBSD|GNU/kFreeBSD)
++Linux|SunOS|DragonFly|FreeBSD|NetBSD|GNU/kFreeBSD)
 +    MOZ_OSS=1
 +    ;;
 +esac
@@ -253,7 +51,7 @@ $NetBSD: patch-aa,v 1.2 2017/01/22 12:27
 +    dnl Prefer 4Front implementation
 +    AC_MSG_CHECKING([MOZ_OSS_CFLAGS])
 +    if test "$OSSPREFIX" != "yes"; then
-+        oss_conf=${OSSPREFIX}/etc/oss.conf
++        oss_conf=${OSSPREFIX%/usr}/etc/oss.conf
 +        if test -f "$oss_conf"; then
 +            . "$oss_conf"
 +        else
@@ -270,7 +68,7 @@ $NetBSD: patch-aa,v 1.2 2017/01/22 12:27
 +
 +    if test "$ac_cv_header_sys_soundcard_h" != "yes" -a \
 +            "$ac_cv_header_soundcard_h" != "yes"; then
-+        AC_MSG_ERROR([Need OSS for Ogg, Wave or WebM decoding on $OS_TARGET.  Disable with --disable-ogg --disable-wave --disable-webm.])
++        AC_MSG_ERROR([Need OSS for Ogg, Wave or WebM decoding on $OS_TARGET.  Disable with --without-oss.])
 +    fi
 +
 +    dnl Assume NetBSD implementation over SunAudio
@@ -289,101 +87,3 @@ $NetBSD: patch-aa,v 1.2 2017/01/22 12:27
  dnl = Check alsa availability on Linux
  dnl ==================================
  
-@@ -5571,12 +5777,23 @@ MOZ_ARG_ENABLE_BOOL(alsa,
-    MOZ_ALSA=1,
-    MOZ_ALSA=)
- 
-+MOZ_ARG_DISABLE_BOOL(alsa-dlopen,
-+[  --disable-alsa-dlopen   Disable runtime linking of libasound.so],
-+   DISABLE_LIBASOUND_DLOPEN=1,
-+   DISABLE_LIBASOUND_DLOPEN=)
-+
- if test -n "$MOZ_ALSA"; then
-     PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
-          [echo "$MOZ_ALSA_PKG_ERRORS"
-           AC_MSG_ERROR([Need alsa for audio output on Linux. (On Ubuntu, you might try installing the package libasound2-dev.)])])
- fi
- 
-+if test -n "$DISABLE_LIBASOUND_DLOPEN"; then
-+    AC_DEFINE(DISABLE_LIBASOUND_DLOPEN)
-+else
-+    MOZ_ALSA_LIBS=
-+fi
-+
- AC_SUBST(MOZ_ALSA)
- 
- dnl ========================================================
-@@ -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 ========================================================
-+dnl Check for harfbuzz
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-harfbuzz,
-+[  --with-system-harfbuzz  Use system harfbuzz (located with pkgconfig)],
-+MOZ_NATIVE_HARFBUZZ=1,
-+MOZ_NATIVE_HARFBUZZ=)
-+
-+if test -n "$MOZ_NATIVE_HARFBUZZ"; then
-+    PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.34)
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_HARFBUZZ)
-+
-+dnl ========================================================
-+dnl Check for graphite2
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-graphite2,
-+[  --with-system-graphite2 Use system graphite2 (located with pkgconfig)],
-+MOZ_NATIVE_GRAPHITE2=1,
-+MOZ_NATIVE_GRAPHITE2=)
-+
-+if test -n "$MOZ_NATIVE_GRAPHITE2"; then
-+    PKG_CHECK_MODULES(MOZ_GRAPHITE2, graphite2)
-+
-+    dnl graphite2.pc has bogus version, check manually
-+    AC_TRY_COMPILE([ #include <graphite2/Font.h>
-+                     #define GR2_VERSION_REQUIRE(major,minor,bugfix)  \
-+                             ( GR2_VERSION_MAJOR * 10000 + GR2_VERSION_MINOR \
-+                               * 100 + GR2_VERSION_BUGFIX >= \
-+                               (major) * 10000 + (minor) * 100 + (bugfix) )
-+                   ], [
-+                     #if !GR2_VERSION_REQUIRE(1,2,4)
-+                     #error "Insufficient graphite2 version."
-+                     #endif
-+                   ], [],
-+                   [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])])
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_GRAPHITE2)
-+
-+dnl ========================================================
- dnl Check for pixman and cairo
- dnl ========================================================
- 
Index: pkgsrc/security/tor-browser/patches/patch-image_decoders_nsJPEGDecoder.cpp
diff -u pkgsrc/security/tor-browser/patches/patch-image_decoders_nsJPEGDecoder.cpp:1.2 pkgsrc/security/tor-browser/patches/patch-image_decoders_nsJPEGDecoder.cpp:1.3
--- pkgsrc/security/tor-browser/patches/patch-image_decoders_nsJPEGDecoder.cpp:1.2      Sun Jan 22 12:27:22 2017
+++ pkgsrc/security/tor-browser/patches/patch-image_decoders_nsJPEGDecoder.cpp  Mon Feb 25 15:32:24 2019
@@ -1,8 +1,11 @@
-$NetBSD: patch-image_decoders_nsJPEGDecoder.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
+$NetBSD: patch-image_decoders_nsJPEGDecoder.cpp,v 1.3 2019/02/25 15:32:24 wiz Exp $
 
---- image/decoders/nsJPEGDecoder.cpp.orig      2015-08-07 15:54:06.000000000 +0000
+Partially revert https://bugzilla.mozilla.org/show_bug.cgi?id=791305
+to allow building against jpeg (not jpeg-turbo).
+
+--- image/decoders/nsJPEGDecoder.cpp.orig      2019-02-23 20:00:48.000000000 +0000
 +++ image/decoders/nsJPEGDecoder.cpp
-@@ -23,13 +23,28 @@
+@@ -29,13 +29,28 @@
  
  extern "C" {
  #include "iccjpeg.h"
@@ -32,28 +35,28 @@ $NetBSD: patch-image_decoders_nsJPEGDeco
  
  static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width);
  
-@@ -373,6 +388,7 @@ nsJPEGDecoder::WriteInternal(const char*
-         case JCS_GRAYSCALE:
-         case JCS_RGB:
-         case JCS_YCbCr:
+@@ -339,6 +354,7 @@ LexerTransition<nsJPEGDecoder::State> ns
+           case JCS_GRAYSCALE:
+           case JCS_RGB:
+           case JCS_YCbCr:
 +#ifdef JCS_EXTENSIONS
-           // if we're not color managing we can decode directly to
-           // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB
-           if (mCMSMode != eCMSMode_All) {
-@@ -381,6 +397,9 @@ nsJPEGDecoder::WriteInternal(const char*
-           } else {
+             // if we're not color managing we can decode directly to
+             // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB
+             if (mCMSMode != eCMSMode_All) {
+@@ -347,6 +363,9 @@ LexerTransition<nsJPEGDecoder::State> ns
+             } else {
                mInfo.out_color_space = JCS_RGB;
-           }
+             }
 +#else
-+          mInfo.out_color_space = JCS_RGB;
++            mInfo.out_color_space = JCS_RGB;
 +#endif
-           break;
-         case JCS_CMYK:
-         case JCS_YCCK:
-@@ -448,6 +467,16 @@ nsJPEGDecoder::WriteInternal(const char*
-       return; // I/O suspension
-     }
- 
+             break;
+           case JCS_CMYK:
+           case JCS_YCCK:
+@@ -442,6 +461,16 @@ LexerTransition<nsJPEGDecoder::State> ns
+                   ("} (I/O suspension after OutputScanlines() - SEQUENTIAL)"));
+           return Transition::ContinueUnbuffered(
+               State::JPEG_DATA);  // I/O suspension
 +#ifndef JCS_EXTENSIONS
 +    /* Force to use our YCbCr to Packed RGB converter when possible */
 +    if (!mTransform && (mCMSMode != eCMSMode_All) &&
@@ -64,24 +67,24 @@ $NetBSD: patch-image_decoders_nsJPEGDeco
 +    }
 +#endif
 +
-     // If this is a progressive JPEG ...
-     mState = mInfo.buffered_image ?
-              JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL;
-@@ -629,7 +658,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus
+         }
  
-       MOZ_ASSERT(imageRow, "Should have a row buffer here");
+         // If we've completed image output ...
+@@ -620,7 +649,11 @@ void nsJPEGDecoder::OutputScanlines(bool
+ 
+     MOZ_ASSERT(imageRow, "Should have a row buffer here");
  
 +#ifdef JCS_EXTENSIONS
-       if (mInfo.out_color_space == MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB) {
+     if (mInfo.out_color_space == MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB) {
 +#else
-+      if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) {
-+#endif
-         // Special case: scanline will be directly converted into packed ARGB
-         if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) {
-           *suspend = true; // suspend
-@@ -953,6 +986,282 @@ term_source (j_decompress_ptr jd)
- } // namespace image
- } // namespace mozilla
++    if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) {
++#endif  
+       // Special case: scanline will be directly converted into packed ARGB
+       if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) {
+         *suspend = true;  // suspend
+@@ -943,6 +976,282 @@ term_source(j_decompress_ptr jd) {
+ }  // namespace image
+ }  // namespace mozilla
  
 +#ifndef JCS_EXTENSIONS
 +/**************** YCbCr -> Cairo's RGB24/ARGB32 conversion: most common case **************/
Index: pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
diff -u pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc:1.2 pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc:1.3
--- pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc:1.2      Sun Jan 22 12:27:22 2017
+++ pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc  Mon Feb 25 15:32:24 2019
@@ -1,16 +1,13 @@
-$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.2 2017/01/22 12:27:22 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.3 2019/02/25 15:32:24 wiz Exp $
 
-* Just because OS_ARCH is Darwin does not mean MacOS X specific
-  kludges are needed.
+* Support NetBSD
+* Support Solaris (we can't rely on pthread_setname_np so ignore it).
 
---- 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.orig        2019-02-23 20:00:48.000000000 +0000
 +++ ipc/chromium/src/base/platform_thread_posix.cc
-@@ -9,22 +9,24 @@
- 
+@@ -12,7 +12,9 @@
  #if defined(OS_MACOSX)
  #include <mach/mach.h>
-+#include <dlfcn.h>
-+#include <string>
  #elif defined(OS_NETBSD)
 +_Pragma("GCC visibility push(default)")
  #include <lwp.h>
@@ -18,73 +15,12 @@ $NetBSD: patch-ipc_chromium_src_base_pla
  #elif defined(OS_LINUX)
  #include <sys/syscall.h>
  #include <sys/prctl.h>
- #endif
- 
--#if !defined(OS_MACOSX)
- #include <unistd.h>
--#endif
- 
- #if defined(OS_BSD) && !defined(OS_NETBSD) && !defined(__GLIBC__)
- #include <pthread_np.h>
- #endif
- 
--#if defined(OS_MACOSX)
-+#if defined(MOZ_WIDGET_COCOA)
- namespace base {
- void InitThreading();
- }  // namespace
-@@ -82,7 +84,7 @@ void PlatformThread::Sleep(int duration_
-     sleep_time = remaining;
- }
- 
--#ifndef OS_MACOSX
-+#ifndef MOZ_WIDGET_COCOA
- // Mac is implemented in platform_thread_mac.mm.
- 
- // static
-@@ -105,19 +107,41 @@ void PlatformThread::SetName(const char*
-   pthread_setname_np(pthread_self(), "%s", (void *)name);
+@@ -100,7 +102,7 @@ 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);
--#else
-+#elif defined(OS_MACOSX)
-+  // Copied from platform_thread_mac.mm
-+
-+  // pthread_setname_np is only available in 10.6 or later, so test
-+  // for it at runtime.
-+  int (*dynamic_pthread_setname_np)(const char*);
-+  *reinterpret_cast<void**>(&dynamic_pthread_setname_np) =
-+      dlsym(RTLD_DEFAULT, "pthread_setname_np");
-+  if (!dynamic_pthread_setname_np)
-+    return;
-+
-+  // Mac OS X does not expose the length limit of the name, so
-+  // hardcode it.
-+  const int kMaxNameLength = 63;
-+  std::string shortened_name = std::string(name).substr(0, kMaxNameLength);
-+  // pthread_setname() fails (harmlessly) in the sandbox, ignore when it does.
-+  // See http://crbug.com/47058
-+
-+  // The name parameter is copied thus it's safe to release it after calling.
-+  // Checked against the bionic implementation in bionic/libc/bionic/pthread.c
-+  dynamic_pthread_setname_np(shortened_name.c_str());
-+#elif !defined(OS_SOLARIS)
-+  prctl(PR_SET_NAME, reinterpret_cast<uintptr_t>(name), 0, 0, 0);
+-#elif defined(OS_SOLARIS)
++#elif defined(notOS_SOLARIS)
+   pthread_setname_np(pthread_self(), name);
+ #else
  #endif
- }
--#endif // !OS_MACOSX
-+#endif // !MOZ_WIDGET_COCOA
- 
- namespace {
- 
- bool CreateThread(size_t stack_size, bool joinable,
-                   PlatformThread::Delegate* delegate,
-                   PlatformThreadHandle* thread_handle) {
--#if defined(OS_MACOSX)
-+#if defined(MOZ_WIDGET_COCOA)
-   base::InitThreading();
--#endif  // OS_MACOSX
-+#endif  // MOZ_WIDGET_COCOA
- 
-   bool success = false;
-   pthread_attr_t attributes;
Index: pkgsrc/security/tor-browser/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
diff -u pkgsrc/security/tor-browser/patches/patch-ipc_glue_GeckoChildProcessHost.cpp:1.2 pkgsrc/security/tor-browser/patches/patch-ipc_glue_GeckoChildProcessHost.cpp:1.3
--- pkgsrc/security/tor-browser/patches/patch-ipc_glue_GeckoChildProcessHost.cpp:1.2    Sun Jan 22 12:27:22 2017
+++ pkgsrc/security/tor-browser/patches/patch-ipc_glue_GeckoChildProcessHost.cpp        Mon Feb 25 15:32:24 2019
@@ -1,9 +1,9 @@
-$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
+$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.3 2019/02/25 15:32:24 wiz Exp $
 
-* Just because OS_ARCH is Darwin does not mean MacOS X specific
-  kludges are needed.
+* Support Solaris
+* Fix NetBSD linking
 
---- ipc/glue/GeckoChildProcessHost.cpp.orig    2015-01-09 04:38:16.000000000 +0000
+--- ipc/glue/GeckoChildProcessHost.cpp.orig    2017-07-31 16:20:47.000000000 +0000
 +++ ipc/glue/GeckoChildProcessHost.cpp
 @@ -4,7 +4,13 @@
   * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -19,30 +19,3 @@ $NetBSD: patch-ipc_glue_GeckoChildProces
  
  #include "base/command_line.h"
  #include "base/string_util.h"
-@@ -533,7 +539,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
-   // and passing wstrings from one config to the other is unsafe.  So
-   // we split the logic here.
- 
--#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || defined(OS_SOLARIS)
-   base::environment_map newEnvVars;
-   ChildPrivileges privs = mPrivileges;
-   if (privs == base::PRIVILEGES_DEFAULT) {
-@@ -672,7 +678,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
-   childArgv.push_back(pidstring);
- 
- #if defined(MOZ_CRASHREPORTER)
--#  if defined(OS_LINUX) || defined(OS_BSD)
-+#  if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_SOLARIS)
-   int childCrashFd, childCrashRemapFd;
-   if (!CrashReporter::CreateNotificationPipeForChild(
-         &childCrashFd, &childCrashRemapFd))
-@@ -705,7 +711,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
-   childArgv.push_back(childProcessType);
- 
-   base::LaunchApp(childArgv, mFileMap,
--#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || defined(OS_SOLARIS)
-                   newEnvVars, privs,
- #endif
-                   false, &process, arch);
Index: pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_cubeb.c
diff -u pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_cubeb.c:1.2 pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_cubeb.c:1.3
--- pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_cubeb.c:1.2    Sun Jan 22 12:27:22 2017
+++ pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_cubeb.c        Mon Feb 25 15:32:24 2019
@@ -1,8 +1,10 @@
-$NetBSD: patch-media_libcubeb_src_cubeb.c,v 1.2 2017/01/22 12:27:22 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb.c,v 1.3 2019/02/25 15:32:24 wiz Exp $
 
---- media/libcubeb/src/cubeb.c.orig    2016-02-25 23:01:58.000000000 +0000
+* Support OSS audio
+
+--- media/libcubeb/src/cubeb.c.orig    2017-07-31 16:20:49.000000000 +0000
 +++ media/libcubeb/src/cubeb.c
-@@ -60,6 +60,9 @@ int audiotrack_init(cubeb ** context, ch
+@@ -55,6 +55,9 @@ int audiotrack_init(cubeb ** context, ch
  #if defined(USE_KAI)
  int kai_init(cubeb ** context, char const * context_name);
  #endif
@@ -10,9 +12,20 @@ $NetBSD: patch-media_libcubeb_src_cubeb.
 +int oss_init(cubeb ** context, char const * context_name);
 +#endif
  
- int
- validate_stream_params(cubeb_stream_params stream_params)
-@@ -129,6 +132,9 @@ cubeb_init(cubeb ** context, char const 
+ static int
+ validate_stream_params(cubeb_stream_params * input_stream_params,
+@@ -155,6 +158,10 @@ cubeb_init(cubeb ** context, char const 
+ #if defined(USE_KAI)
+       init_oneshot = kai_init;
+ #endif
++    } else if (!strcmp(backend_name, "oss")) {
++#if defined(USE_OSS)
++      init_oneshot = oss_init;
++#endif
+     } else {
+       /* Already set */
+     }
+@@ -199,6 +206,9 @@ cubeb_init(cubeb ** context, char const 
  #if defined(USE_KAI)
      kai_init,
  #endif
Index: pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_cubeb__alsa.c
diff -u pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_cubeb__alsa.c:1.2 pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_cubeb__alsa.c:1.3
--- pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_cubeb__alsa.c:1.2      Sun Jan 22 12:27:22 2017
+++ pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_cubeb__alsa.c  Mon Feb 25 15:32:24 2019
@@ -1,14 +1,15 @@
-$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.2 2017/01/22 12:27:22 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.3 2019/02/25 15:32:24 wiz Exp $
 
---- media/libcubeb/src/cubeb_alsa.c.orig       2016-02-25 23:01:58.000000000 +0000
+* Support alsa audio under NetBSD
+* Avoid https://github.com/kinetiknz/cubeb/issues/226
+
+--- media/libcubeb/src/cubeb_alsa.c.orig       2018-05-03 16:58:30.000000000 +0000
 +++ media/libcubeb/src/cubeb_alsa.c
-@@ -7,12 +7,18 @@
+@@ -7,11 +7,13 @@
  #undef NDEBUG
  #define _DEFAULT_SOURCE
  #define _BSD_SOURCE
-+#if defined(__NetBSD__)
 +#define _NETBSD_SOURCE
-+#endif
  #define _XOPEN_SOURCE 500
  #include <pthread.h>
  #include <sys/time.h>
@@ -16,12 +17,9 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  #include <limits.h>
 +#include <dlfcn.h>
  #include <poll.h>
-+#include <stdlib.h>
-+#include <stdio.h>
  #include <unistd.h>
  #include <alsa/asoundlib.h>
- #include "cubeb/cubeb.h"
-@@ -25,6 +31,51 @@
+@@ -25,6 +27,52 @@
  
  #define ALSA_PA_PLUGIN "ALSA <-> PulseAudio PCM I/O Plugin"
  
@@ -44,7 +42,6 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
 +MAKE_TYPEDEF(snd_pcm_close);
 +MAKE_TYPEDEF(snd_pcm_delay);
 +MAKE_TYPEDEF(snd_pcm_drain);
-+MAKE_TYPEDEF(snd_pcm_forward);
 +MAKE_TYPEDEF(snd_pcm_frames_to_bytes);
 +MAKE_TYPEDEF(snd_pcm_get_params);
 +/* snd_pcm_hw_params_alloca is actually a macro */
@@ -62,8 +59,10 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
 +MAKE_TYPEDEF(snd_pcm_poll_descriptors);
 +MAKE_TYPEDEF(snd_pcm_poll_descriptors_count);
 +MAKE_TYPEDEF(snd_pcm_poll_descriptors_revents);
++MAKE_TYPEDEF(snd_pcm_readi);
 +MAKE_TYPEDEF(snd_pcm_recover);
 +MAKE_TYPEDEF(snd_pcm_set_params);
++MAKE_TYPEDEF(snd_pcm_start);
 +MAKE_TYPEDEF(snd_pcm_state);
 +MAKE_TYPEDEF(snd_pcm_writei);
 +
@@ -73,7 +72,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  /* 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 @@ struct cubeb {
+@@ -65,6 +113,8 @@ struct cubeb {
       workaround is not required. */
    snd_config_t * local_config;
    int is_pa;
@@ -82,179 +81,85 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  };
  
  enum stream_state {
-@@ -258,32 +311,35 @@ alsa_refill_stream(cubeb_stream * stm)
-   long got;
-   void * p;
-   int draining;
-+  unsigned pipefailures, againfailures;
+@@ -245,8 +295,8 @@ set_timeout(struct timeval * timeout, un
+ static void
+ stream_buffer_decrement(cubeb_stream * stm, long count)
+ {
+-  char * bufremains = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, count);
+-  memmove(stm->buffer, bufremains, snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes - count));
++  char * bufremains = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, count);
++  memmove(stm->buffer, bufremains, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes - count));
+   stm->bufframes -= count;
+ }
  
-   draining = 0;
+@@ -278,9 +328,9 @@ alsa_process_stream(cubeb_stream * stm)
+   /* Call _poll_descriptors_revents() even if we don't use it
+      to let underlying plugins clear null events.  Otherwise poll()
+      may wake up again and again, producing unnecessary CPU usage. */
+-  snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents);
++  WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents);
  
-   pthread_mutex_lock(&stm->mutex);
- 
--  r = snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents);
--  if (r < 0 || revents != POLLOUT) {
--    /* This should be a stream error; it makes no sense for poll(2) to wake
--       for this stream and then have the stream report that it's not ready.
--       Unfortunately, this does happen, so just bail out and try again. */
--    pthread_mutex_unlock(&stm->mutex);
--    return RUNNING;
--  }
--
 -  avail = snd_pcm_avail_update(stm->pcm);
--  if (avail == -EPIPE) {
--    snd_pcm_recover(stm->pcm, avail, 1);
--    avail = snd_pcm_avail_update(stm->pcm);
--  }
-+  for (pipefailures = 0;;) {
-+    r = WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents);
-+    if (r < 0 || revents != POLLOUT ||
-+      (avail = WRAP(snd_pcm_avail_update)(stm->pcm)) == 0) {
-+      /* This should be a stream error; it makes no sense for poll(2) to wake
-+         for this stream and then have the stream report that it's not ready.
-+         Unfortunately, this does happen, so just bail out and try again. */
-+      pthread_mutex_unlock(&stm->mutex);
-+      return RUNNING;
-+    }
- 
--  /* Failed to recover from an xrun, this stream must be broken. */
--  if (avail < 0) {
--    pthread_mutex_unlock(&stm->mutex);
--    stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
--    return ERROR;
-+    if (avail > 0)
-+      break;
-+    if (pipefailures++ > 11) {
-+      fprintf(stderr, "%s: repeated failures from snd_pcm_avail_update, "
-+              "giving up\n", __func__);
-+      pthread_mutex_unlock(&stm->mutex);
-+      stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
-+      return ERROR;
-+    }
-+    WRAP(snd_pcm_recover)(stm->pcm, avail, 1);
-   }
-+  pipefailures = againfailures = 0;
- 
-   /* This should never happen. */
-   if ((unsigned int) avail > stm->buffer_size) {
-@@ -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. */
++  avail = WRAP(snd_pcm_avail_update)(stm->pcm);
+ 
+   /* Got null event? Bail and wait for another wakeup. */
    if (avail == 0) {
--    snd_pcm_recover(stm->pcm, -EPIPE, 1);
--    avail = snd_pcm_avail_update(stm->pcm);
-+    WRAP(snd_pcm_recover)(stm->pcm, -EPIPE, 1);
-+    avail = WRAP(snd_pcm_avail_update)(stm->pcm);
-     if (avail <= 0) {
-       pthread_mutex_unlock(&stm->mutex);
-       stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
-@@ -303,7 +359,7 @@ alsa_refill_stream(cubeb_stream * stm)
+@@ -303,7 +353,7 @@ alsa_process_stream(cubeb_stream * stm)
+       // TODO: should it be marked as DRAINING?
      }
-   }
  
--  p = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, avail));
-+  p = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, avail));
-   assert(p);
+-    got = snd_pcm_readi(stm->pcm, stm->buffer+stm->bufframes, avail);
++    got = WRAP(snd_pcm_readi)(stm->pcm, stm->buffer+stm->bufframes, avail);
  
-   pthread_mutex_unlock(&stm->mutex);
-@@ -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);
-+    free(p);
-     return ERROR;
-   }
-   if (got > 0) {
--    snd_pcm_sframes_t wrote;
-+    snd_pcm_sframes_t wrote, towrite = got;
- 
-     if (stm->params.format == CUBEB_SAMPLE_FLOAT32NE) {
-       float * b = (float *) p;
-@@ -328,14 +385,66 @@ alsa_refill_stream(cubeb_stream * stm)
-         b[i] *= stm->volume;
+     if (got < 0) {
+       avail = got; // the error handler below will recover us
+@@ -347,7 +397,7 @@ alsa_process_stream(cubeb_stream * stm)
+       (!stm->other_stream || stm->other_stream->bufframes > 0)) {
+     long got = avail - stm->bufframes;
+     void * other_buffer = stm->other_stream ? stm->other_stream->buffer : NULL;
+-    char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes);
++    char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes);
+ 
+     /* Correct read size to the other stream available frames */
+     if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) {
+@@ -374,8 +424,8 @@ alsa_process_stream(cubeb_stream * stm)
+     long drain_frames = avail - stm->bufframes;
+     double drain_time = (double) drain_frames / stm->params.rate;
+ 
+-    char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes);
+-    memset(buftail, 0, snd_pcm_frames_to_bytes(stm->pcm, drain_frames));
++    char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes);
++    memset(buftail, 0, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, drain_frames));
+     stm->bufframes = avail;
+ 
+     /* Mark as draining, unless we're waiting for capture */
+@@ -402,7 +452,7 @@ alsa_process_stream(cubeb_stream * stm)
        }
      }
--    wrote = snd_pcm_writei(stm->pcm, p, got);
--    if (wrote == -EPIPE) {
--      snd_pcm_recover(stm->pcm, wrote, 1);
--      wrote = snd_pcm_writei(stm->pcm, p, got);
--    }
--    assert(wrote >= 0 && wrote == got);
--    stm->write_position += wrote;
--    gettimeofday(&stm->last_activity, NULL);
-+    for (;;) {
-+      wrote = WRAP(snd_pcm_writei)(stm->pcm, p,
-+        towrite > avail ? avail : towrite);
-+      switch(wrote) {
-+      case -EPIPE:
-+        if (pipefailures++ > 3) {
-+          fprintf(stderr, "%s: Too many underflows, giving up\n", __func__);
-+          stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
-+          pthread_mutex_unlock(&stm->mutex);
-+          free(p);
-+          return ERROR;
-+        }
-+        WRAP(snd_pcm_recover)(stm->pcm, wrote, 1);
-+        continue;
-+      case -EAGAIN:
-+        if (againfailures++ > 3) {
-+          fprintf(stderr, "%s: Too many -EAGAIN errors from snd_pcm_writei, "
-+          "giving up\n", __func__);
-+          stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
-+          pthread_mutex_unlock(&stm->mutex);
-+          free(p);
-+          return ERROR;
-+        }
-+        continue;
-+#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;
-+      }
-+      if (wrote < 0) {
-+        fprintf(stderr, "%s: snc_pcm_writei returned unexpected error %lld, "
-+                "giving up\n", __func__, (long long)wrote);
-+        free(p);
-+        stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
-+        pthread_mutex_unlock(&stm->mutex);
-+        return ERROR;
-+      }
-+      pipefailures = againfailures = 0;
-+      stm->write_position += wrote;
-+      gettimeofday(&stm->last_activity, NULL);
-+      if (wrote > towrite) {
-+        fprintf(stderr, "%s: snc_pcm_writei wrote %lld frames, which was more "
-+              "than we requested (%lld). This should not happen, giving up\n",
-+                __func__, (long long)wrote, (long long)towrite);
-+        free(p);
-+        stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
-+        pthread_mutex_unlock(&stm->mutex);
-+        return ERROR;
-+      }
-+      if (towrite == wrote)
-+        break;
-+      towrite -= wrote;
-+    }
-   }
-   if (got != avail) {
-     long buffer_fill = stm->buffer_size - (avail - got);
-@@ -343,7 +452,7 @@ alsa_refill_stream(cubeb_stream * stm)
- 
-     /* Fill the remaining buffer with silence to guarantee one full period
-        has been written. */
--    snd_pcm_writei(stm->pcm, (char *) p + got, avail - got);
-+    WRAP(snd_pcm_writei)(stm->pcm, (char *) p + got, avail - got);
  
-     set_timeout(&stm->drain_timeout, buffer_time * 1000);
+-    wrote = snd_pcm_writei(stm->pcm, stm->buffer, avail);
++    wrote = WRAP(snd_pcm_writei)(stm->pcm, stm->buffer, avail);
+     if (wrote < 0) {
+       avail = wrote; // the error handler below will recover us
+     } else {
+@@ -415,13 +465,13 @@ alsa_process_stream(cubeb_stream * stm)
+ 
+   /* Got some error? Let's try to recover the stream. */
+   if (avail < 0) {
+-    avail = snd_pcm_recover(stm->pcm, avail, 0);
++    avail = WRAP(snd_pcm_recover)(stm->pcm, avail, 0);
+ 
+     /* Capture pcm must be started after initial setup/recover */
+     if (avail >= 0 &&
+         stm->stream_type == SND_PCM_STREAM_CAPTURE &&
+-        snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) {
+-      avail = snd_pcm_start(stm->pcm);
++        WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) {
++      avail = WRAP(snd_pcm_start)(stm->pcm);
+     }
+   }
  
-@@ -454,26 +563,26 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -537,26 +587,26 @@ get_slave_pcm_node(snd_config_t * lconf,
  
    slave_def = NULL;
  
@@ -286,7 +191,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -482,7 +591,7 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -565,7 +615,7 @@ get_slave_pcm_node(snd_config_t * lconf,
      if (r < 0 || r > (int) sizeof(node_name)) {
        break;
      }
@@ -295,7 +200,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -491,7 +600,7 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -574,7 +624,7 @@ get_slave_pcm_node(snd_config_t * lconf,
    } while (0);
  
    if (slave_def) {
@@ -304,7 +209,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    }
  
    return NULL;
-@@ -514,22 +623,22 @@ init_local_config_with_workaround(char c
+@@ -597,22 +647,22 @@ init_local_config_with_workaround(char c
  
    lconf = NULL;
  
@@ -331,7 +236,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -538,7 +647,7 @@ init_local_config_with_workaround(char c
+@@ -621,7 +671,7 @@ init_local_config_with_workaround(char c
      if (r < 0 || r > (int) sizeof(node_name)) {
        break;
      }
@@ -340,7 +245,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -549,12 +658,12 @@ init_local_config_with_workaround(char c
+@@ -632,12 +682,12 @@ init_local_config_with_workaround(char c
      }
  
      /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */
@@ -355,7 +260,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -565,18 +674,18 @@ init_local_config_with_workaround(char c
+@@ -648,18 +698,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. */
@@ -377,7 +282,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -584,7 +693,7 @@ init_local_config_with_workaround(char c
+@@ -667,7 +717,7 @@ init_local_config_with_workaround(char c
      return lconf;
    } while (0);
  
@@ -386,19 +291,19 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  
    return NULL;
  }
-@@ -596,9 +705,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s
+@@ -679,9 +729,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, c
  
    pthread_mutex_lock(&cubeb_alsa_mutex);
    if (local_config) {
--    r = snd_pcm_open_lconf(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK, local_config);
-+    r = WRAP(snd_pcm_open_lconf)(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK, local_config);
+-    r = snd_pcm_open_lconf(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config);
++    r = WRAP(snd_pcm_open_lconf)(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config);
    } else {
--    r = snd_pcm_open(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK);
-+    r = WRAP(snd_pcm_open)(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK);
+-    r = snd_pcm_open(pcm, pcm_name, stream, SND_PCM_NONBLOCK);
++    r = WRAP(snd_pcm_open)(pcm, pcm_name, stream, SND_PCM_NONBLOCK);
    }
    pthread_mutex_unlock(&cubeb_alsa_mutex);
  
-@@ -611,7 +720,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
+@@ -694,7 +744,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
    int r;
  
    pthread_mutex_lock(&cubeb_alsa_mutex);
@@ -407,7 +312,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    pthread_mutex_unlock(&cubeb_alsa_mutex);
  
    return r;
-@@ -668,12 +777,65 @@ alsa_init(cubeb ** context, char const *
+@@ -757,12 +807,65 @@ alsa_init(cubeb ** context, char const *
    pthread_attr_t attr;
    snd_pcm_t * dummy;
  
@@ -474,7 +379,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      cubeb_alsa_error_handler_set = 1;
    }
    pthread_mutex_unlock(&cubeb_alsa_mutex);
-@@ -681,6 +843,8 @@ alsa_init(cubeb ** context, char const *
+@@ -770,6 +873,8 @@ alsa_init(cubeb ** context, char const *
    ctx = calloc(1, sizeof(*ctx));
    assert(ctx);
  
@@ -483,7 +388,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    ctx->ops = &alsa_ops;
  
    r = pthread_mutex_init(&ctx->mutex, NULL);
-@@ -730,7 +894,7 @@ alsa_init(cubeb ** context, char const *
+@@ -819,7 +924,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);
@@ -492,7 +397,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
        pthread_mutex_unlock(&cubeb_alsa_mutex);
        ctx->local_config = NULL;
      } else if (r >= 0) {
-@@ -769,9 +933,13 @@ alsa_destroy(cubeb * ctx)
+@@ -859,9 +964,13 @@ alsa_destroy(cubeb * ctx)
    pthread_mutex_destroy(&ctx->mutex);
    free(ctx->fds);
  
@@ -507,7 +412,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      pthread_mutex_unlock(&cubeb_alsa_mutex);
    }
  
-@@ -839,7 +1007,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
+@@ -948,7 +1057,7 @@ alsa_stream_init_single(cubeb * ctx, cub
      return CUBEB_ERROR;
    }
  
@@ -515,26 +420,30 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
 +  r = WRAP(snd_pcm_nonblock)(stm->pcm, 1);
    assert(r == 0);
  
-   /* Ugly hack: the PA ALSA plugin allows buffer configurations that can't
-@@ -849,23 +1017,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
-     latency = latency < 500 ? 500 : latency;
+   latency_us = latency_frames * 1e6 / stm->params.rate;
+@@ -961,7 +1070,7 @@ alsa_stream_init_single(cubeb * ctx, cub
+     latency_us = latency_us < min_latency ? min_latency: latency_us;
    }
  
 -  r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,
--                         stm->params.channels, stm->params.rate, 1,
--                         latency * 1000);
 +  r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,
-+                               stm->params.channels, stm->params.rate, 1,
-+                               latency * 1000);
+                          stm->params.channels, stm->params.rate, 1,
+                          latency_us);
    if (r < 0) {
-     alsa_stream_destroy(stm);
+@@ -969,20 +1078,20 @@ alsa_stream_init_single(cubeb * ctx, cub
      return CUBEB_ERROR_INVALID_FORMAT;
    }
  
--  r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &stm->period_size);
-+  r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &stm->period_size);
+-  r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &period_size);
++  r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &period_size);
    assert(r == 0);
  
+   /* Double internal buffer size to have enough space when waiting for the other side of duplex connection */
+   stm->buffer_size *= 2;
+-  stm->buffer = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, stm->buffer_size));
++  stm->buffer = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->buffer_size));
+   assert(stm->buffer);
+ 
 -  stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm);
 +  stm->nfds = WRAP(snd_pcm_poll_descriptors_count)(stm->pcm);
    assert(stm->nfds > 0);
@@ -545,8 +454,8 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
 +  r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds);
    assert((nfds_t) r == stm->nfds);
  
-   r = pthread_cond_init(&stm->cond, NULL);
-@@ -896,7 +1064,7 @@ alsa_stream_destroy(cubeb_stream * stm)
+   if (alsa_register_stream(ctx, stm) != 0) {
+@@ -1054,7 +1163,7 @@ alsa_stream_destroy(cubeb_stream * stm)
    pthread_mutex_lock(&stm->mutex);
    if (stm->pcm) {
      if (stm->state == DRAINING) {
@@ -555,21 +464,9 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      }
      alsa_locked_pcm_close(stm->pcm);
      stm->pcm = NULL;
-@@ -906,7 +1074,10 @@ alsa_stream_destroy(cubeb_stream * stm)
-   pthread_mutex_destroy(&stm->mutex);
- 
-   r = pthread_cond_destroy(&stm->cond);
--  assert(r == 0);
-+  if (r != 0) {       /* XXX stopgap until someone figures out the real reason */
-+    fprintf(stderr,"alsa_stream_destroy: pthread_cond_destroy failed: %s",
-+      strerror(r));
-+  }
+@@ -1100,12 +1209,12 @@ alsa_get_max_channel_count(cubeb * ctx, 
  
-   alsa_unregister_stream(stm);
- 
-@@ -938,12 +1109,12 @@ alsa_get_max_channel_count(cubeb * ctx, 
-     return CUBEB_ERROR;
-   }
+   assert(stm);
  
 -  r = snd_pcm_hw_params_any(stm->pcm, hw_params);
 +  r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params);
@@ -582,12 +479,12 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    if (r < 0) {
      return CUBEB_ERROR;
    }
-@@ -963,34 +1134,34 @@ alsa_get_preferred_sample_rate(cubeb * c
+@@ -1126,34 +1235,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, 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);
+-  r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE);
++  r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE);
    if (r < 0) {
      return CUBEB_ERROR;
    }
@@ -625,16 +522,21 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  
    return CUBEB_OK;
  }
-@@ -1014,7 +1185,7 @@ alsa_stream_start(cubeb_stream * stm)
-   ctx = stm->context;
- 
+@@ -1186,10 +1295,10 @@ alsa_stream_start(cubeb_stream * stm)
    pthread_mutex_lock(&stm->mutex);
+   /* Capture pcm must be started after initial setup/recover */
+   if (stm->stream_type == SND_PCM_STREAM_CAPTURE &&
+-      snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) {
+-    snd_pcm_start(stm->pcm);
++      WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) {
++    WRAP(snd_pcm_start)(stm->pcm);
+   }
 -  snd_pcm_pause(stm->pcm, 0);
 +  WRAP(snd_pcm_pause)(stm->pcm, 0);
    gettimeofday(&stm->last_activity, NULL);
    pthread_mutex_unlock(&stm->mutex);
  
-@@ -1048,7 +1219,7 @@ alsa_stream_stop(cubeb_stream * stm)
+@@ -1229,7 +1338,7 @@ alsa_stream_stop(cubeb_stream * stm)
    pthread_mutex_unlock(&ctx->mutex);
  
    pthread_mutex_lock(&stm->mutex);
@@ -643,7 +545,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    pthread_mutex_unlock(&stm->mutex);
  
    return CUBEB_OK;
-@@ -1064,14 +1235,17 @@ alsa_stream_get_position(cubeb_stream * 
+@@ -1245,8 +1354,8 @@ alsa_stream_get_position(cubeb_stream * 
    pthread_mutex_lock(&stm->mutex);
  
    delay = -1;
@@ -654,17 +556,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      *position = stm->last_position;
      pthread_mutex_unlock(&stm->mutex);
      return CUBEB_OK;
-   }
- 
--  assert(delay >= 0);
-+  if (delay < 0) {
-+    WRAP(snd_pcm_forward)(stm->pcm, -delay);
-+    delay = 0;
-+  }
- 
-   *position = 0;
-   if (stm->write_position >= (snd_pcm_uframes_t) delay) {
-@@ -1090,7 +1264,7 @@ alsa_stream_get_latency(cubeb_stream * s
+@@ -1271,7 +1380,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. */
Index: pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_cubeb__oss.c
diff -u pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_cubeb__oss.c:1.2 pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_cubeb__oss.c:1.3
--- pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_cubeb__oss.c:1.2       Sun Jan 22 12:27:22 2017
+++ pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_cubeb__oss.c   Mon Feb 25 15:32:24 2019
@@ -1,8 +1,10 @@
-$NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.2 2017/01/22 12:27:22 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.3 2019/02/25 15:32:24 wiz Exp $
 
---- media/libcubeb/src/cubeb_oss.c.orig        2015-02-20 05:47:26.000000000 +0000
+* Restore OSS audio support code
+
+--- media/libcubeb/src/cubeb_oss.c.orig        2018-05-09 10:25:44.118207555 +0000
 +++ media/libcubeb/src/cubeb_oss.c
-@@ -0,0 +1,402 @@
+@@ -0,0 +1,454 @@
 +/*
 + * Copyright © 2014 Mozilla Foundation
 + *
@@ -23,6 +25,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
 +#include <errno.h>
 +#include <pthread.h>
 +#include <stdio.h>
++#include <assert.h>
 +
 +#include "cubeb/cubeb.h"
 +#include "cubeb-internal.h"
@@ -38,11 +41,13 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
 +};
 +
 +struct cubeb_stream {
++  /* Note: Must match cubeb_stream layout in cubeb.c. */
 +  cubeb * context;
++  void * user_ptr;
++  /**/
 +
 +  cubeb_data_callback data_callback;
 +  cubeb_state_callback state_callback;
-+  void * user_ptr;
 +  float volume;
 +  float panning;
 +
@@ -93,10 +98,11 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
 +}
 +
 +static int oss_get_min_latency(cubeb * context, cubeb_stream_params params,
-+                               uint32_t * latency_ms)
++                               uint32_t * latency_frames)
 +{
++  (void)context;
 +  /* 40ms is a big enough number to work ok */
-+  *latency_ms = 40;
++  *latency_frames = 40 * params.rate / 1000;
 +  return CUBEB_OK;
 +}
 +
@@ -121,15 +127,15 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
 +  pthread_mutex_lock(&stream->state_mutex);
 +  if (stream->data_callback && stream->running && !stream->stopped) {
 +    pthread_mutex_unlock(&stream->state_mutex);
-+    got = stream->data_callback(stream, stream->user_ptr, buffer, nframes);
++    got = stream->data_callback(stream, stream->user_ptr, NULL, buffer, nframes);
 +  } else {
 +    pthread_mutex_unlock(&stream->state_mutex);
 +  }
 +  return got;
 +}
 +
-+static void apply_volume(int16_t* buffer, unsigned int n,
-+                         float volume, float panning)
++static void apply_volume_int(int16_t* buffer, unsigned int n,
++                             float volume, float panning)
 +{
 +  float left = volume;
 +  float right = volume;
@@ -147,6 +153,26 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
 +  }
 +}
 +
++static void apply_volume_float(float* buffer, unsigned int n,
++                               float volume, float panning)
++{
++  float left = volume;
++  float right = volume;
++  unsigned int i;
++  float pan[2];
++  if (panning<0) {
++    right *= (1+panning);
++  } else {
++    left *= (1-panning);
++  }
++  pan[0] = left;
++  pan[1] = right;
++  for(i=0; i<n; i++){
++    buffer[i] = buffer[i]*pan[i%2];
++  }
++}
++
++
 +static void *writer(void *stm)
 +{
 +  cubeb_stream* stream = (cubeb_stream*)stm;
@@ -171,15 +197,25 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
 +    if (stream->floating) {
 +      got = run_data_callback(stream, f_buffer,
 +                              OSS_BUFFER_SIZE/stream->params.channels);
++      apply_volume_float(f_buffer, got*stream->params.channels,
++                                   stream->volume, stream->panning);
 +      for (i=0; i<((unsigned long)got)*stream->params.channels; i++) {
-+          buffer[i] = f_buffer[i]*32767.0;
++        /* Clipping is prefered to overflow */
++      if(f_buffer[i]>=1.0){
++        f_buffer[i]=1.0;
++      }
++        if(f_buffer[i]<=-1.0){
++        f_buffer[i]=-1.0;
++      }
++        /* One might think that multipling by 32767.0 is logical but results in clipping */
++        buffer[i] = f_buffer[i]*32767.0;
 +      }
 +    } else {
 +      got = run_data_callback(stream, buffer,
 +                              OSS_BUFFER_SIZE/stream->params.channels);
++      apply_volume_int(buffer, got*stream->params.channels,
++                               stream->volume, stream->panning);
 +    }
-+    apply_volume(buffer, got*stream->params.channels,
-+                         stream->volume, stream->panning);
 +    if (got<0) {
 +      run_state_callback(stream, CUBEB_STATE_ERROR);
 +      break;
@@ -209,8 +245,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
 +  unsigned int latency_bytes, n_frag;
 +  int frag;
 +  /* fragment size of 1024 is a good choice with good chances to be accepted */
-+  unsigned int frag_size=1024;
-+  unsigned int frag_log=10; /* 2^frag_log = frag_size */
++  unsigned int frag_log=10; /* 2^frag_log = fragment size */
 +  latency_bytes =
 +    latency*stream->params.rate*stream->params.channels*sizeof(uint16_t)/1000;
 +  n_frag = latency_bytes>>frag_log;
@@ -221,7 +256,10 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
 +
 +static int oss_stream_init(cubeb * context, cubeb_stream ** stm,
 +                           char const * stream_name,
-+                           cubeb_stream_params stream_params,
++                           cubeb_devid input_device,
++                           cubeb_stream_params * input_stream_params,
++                           cubeb_devid output_device,
++                           cubeb_stream_params * output_stream_params,
 +                           unsigned int latency,
 +                           cubeb_data_callback data_callback,
 +                           cubeb_state_callback state_callback, void * user_ptr)
@@ -232,6 +270,17 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
 +  stream->state_callback = state_callback;
 +  stream->user_ptr = user_ptr;
 +
++  assert(!input_stream_params && "not supported.");
++  if (input_device || output_device) {
++    /* Device selection not yet implemented. */
++    return CUBEB_ERROR_DEVICE_UNAVAILABLE;
++  }
++
++  if ((input_stream_params && input_stream_params->prefs & CUBEB_STREAM_PREF_LOOPBACK) ||
++      (output_stream_params && output_stream_params->prefs & CUBEB_STREAM_PREF_LOOPBACK)) {
++    return CUBEB_ERROR_NOT_SUPPORTED;
++  }
++
 +  if ((stream->fd = open(CUBEB_OSS_DEFAULT_OUTPUT, O_WRONLY)) == -1) {
 +    free(stream);
 +    return CUBEB_ERROR;
@@ -243,16 +292,16 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
 +      free(stream); \
 +      return CUBEB_ERROR_INVALID_FORMAT; } } while (0)
 +
-+  stream->params = stream_params;
++  stream->params = *output_stream_params;
 +  stream->volume = 1.0;
 +  stream->panning = 0.0;
 +
 +  oss_try_set_latency(stream, latency); 
 +
 +  stream->floating = 0;
-+  SET(SNDCTL_DSP_CHANNELS, stream_params.channels);
-+  SET(SNDCTL_DSP_SPEED, stream_params.rate);
-+  switch (stream_params.format) {
++  SET(SNDCTL_DSP_CHANNELS, stream->params.channels);
++  SET(SNDCTL_DSP_SPEED, stream->params.rate);
++  switch (stream->params.format) {
 +    case CUBEB_SAMPLE_S16LE:
 +      SET(SNDCTL_DSP_SETFMT, AFMT_S16_LE);
 +    break;
@@ -392,16 +441,21 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
 +  .get_max_channel_count = oss_get_max_channel_count,
 +  .get_min_latency = oss_get_min_latency,
 +  .get_preferred_sample_rate = oss_get_preferred_sample_rate,
++  .get_preferred_channel_layout = NULL,
++  .enumerate_devices = NULL,
++  .device_collection_destroy = NULL,
 +  .destroy = oss_destroy,
 +  .stream_init = oss_stream_init,
 +  .stream_destroy = oss_stream_destroy,
 +  .stream_start = oss_stream_start,
 +  .stream_stop = oss_stream_stop,
++  .stream_reset_default_device = NULL,
 +  .stream_get_position = oss_stream_get_position,
 +  .stream_get_latency = oss_stream_get_latency,
 +  .stream_set_volume = oss_stream_set_volume,
 +  .stream_set_panning = oss_stream_set_panning,
 +  .stream_get_current_device = NULL,
 +  .stream_device_destroy = NULL,
-+  .stream_register_device_changed_callback = NULL
++  .stream_register_device_changed_callback = NULL,
++  .register_device_collection_changed = NULL
 +};
Index: pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_moz.build
diff -u pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_moz.build:1.2 pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_moz.build:1.3
--- pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_moz.build:1.2  Sun Jan 22 12:27:22 2017
+++ pkgsrc/security/tor-browser/patches/patch-media_libcubeb_src_moz.build      Mon Feb 25 15:32:24 2019
@@ -1,10 +1,11 @@
-$NetBSD: patch-media_libcubeb_src_moz.build,v 1.2 2017/01/22 12:27:22 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_moz.build,v 1.3 2019/02/25 15:32:24 wiz Exp $
 
-Don't assume cocoa toolkit just because OS_TARGET is Darwin.
+* Add OSS audio support
+* Support system library
 
---- media/libcubeb/src/moz.build.orig  2016-02-25 23:01:58.000000000 +0000
+--- media/libcubeb/src/moz.build.orig  2018-05-03 16:58:30.000000000 +0000
 +++ media/libcubeb/src/moz.build
-@@ -17,6 +17,12 @@ if CONFIG['MOZ_ALSA']:
+@@ -22,6 +22,12 @@ if CONFIG['MOZ_ALSA']:
      ]
      DEFINES['USE_ALSA'] = True
  
@@ -14,32 +15,14 @@ Don't assume cocoa toolkit just because 
 +    ]
 +    DEFINES['USE_OSS'] = True
 +
- if CONFIG['MOZ_PULSEAUDIO']:
+ if CONFIG['MOZ_PULSEAUDIO'] or CONFIG['MOZ_JACK']:
      SOURCES += [
-         'cubeb_pulse.c',
-@@ -31,7 +37,7 @@ if CONFIG['OS_ARCH'] == 'OpenBSD':
-     ]
-     DEFINES['USE_SNDIO'] = True
- 
--if CONFIG['OS_TARGET'] == 'Darwin':
-+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-     SOURCES += [
-         'cubeb_audiounit.c',
-     ]
-@@ -64,6 +70,9 @@ if CONFIG['OS_TARGET'] == 'Android':
- 
+         'cubeb_resampler.cpp',
+@@ -87,6 +93,7 @@ if CONFIG['OS_TARGET'] == 'Android':
  FINAL_LIBRARY = 'gkmedias'
  
-+if CONFIG['MOZ_NATIVE_SPEEX']:
-+    SOURCES['cubeb_resampler.cpp'].flags += CONFIG['MOZ_SPEEX_CFLAGS']
-+
- 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']
  CFLAGS += CONFIG['MOZ_ALSA_CFLAGS']
++CFLAGS += CONFIG['MOZ_OSS_CFLAGS']
  CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS']
+ 
+ # We allow warnings for third-party code that can be updated from upstream.
Index: pkgsrc/security/tor-browser/patches/patch-media_libpng_pngpriv.h
diff -u pkgsrc/security/tor-browser/patches/patch-media_libpng_pngpriv.h:1.2 pkgsrc/security/tor-browser/patches/patch-media_libpng_pngpriv.h:1.3
--- pkgsrc/security/tor-browser/patches/patch-media_libpng_pngpriv.h:1.2        Sun Jan 22 12:27:22 2017
+++ pkgsrc/security/tor-browser/patches/patch-media_libpng_pngpriv.h    Mon Feb 25 15:32:24 2019
@@ -1,12 +1,17 @@
-$NetBSD: patch-media_libpng_pngpriv.h,v 1.2 2017/01/22 12:27:22 ryoon Exp $
+$NetBSD: patch-media_libpng_pngpriv.h,v 1.3 2019/02/25 15:32:24 wiz Exp $
 
---- media/libpng/pngpriv.h.orig        2014-02-12 21:29:13.000000000 +0000
+Fix _POSIX_SOURCE on SunOS.
+
+--- media/libpng/pngpriv.h.orig        2018-06-05 19:47:32.000000000 +0000
 +++ media/libpng/pngpriv.h
-@@ -38,6 +38,7 @@
+@@ -36,8 +36,10 @@
   * still required (as of 2011-05-02.)
   */
- #define _POSIX_SOURCE 1 /* Just the POSIX 1003.1 and C89 APIs */
-+#define _XOPEN_SOURCE 600
+ #ifndef _POSIX_SOURCE
++#if !defined(__sun) || (__STDC_VERSION__-0 < 199901L)
+ # define _POSIX_SOURCE 1 /* Just the POSIX 1003.1 and C89 APIs */
+ #endif
++#endif
  
  #ifndef PNG_VERSION_INFO_ONLY
  /* Standard library headers not required by png.h: */
Index: pkgsrc/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
diff -u pkgsrc/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc:1.2 
pkgsrc/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc:1.3
--- pkgsrc/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc:1.2 Sun Jan 22 12:27:22 2017
+++ pkgsrc/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc     Mon Feb 25 15:32:24 2019
@@ -1,8 +1,8 @@
-$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 $
+$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc,v 1.3 2019/02/25 15:32:24 wiz 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.orig    2017-09-14 20:16:07.000000000 +0000
 +++ media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
-@@ -25,10 +25,21 @@
+@@ -25,6 +25,9 @@
  #else
  #include <linux/videodev2.h>
  #endif
@@ -10,8 +10,11 @@ $NetBSD: patch-media_webrtc_trunk_webrtc
 +#include <libv4l2.h>
 +#endif
  
- #include "webrtc/system_wrappers/interface/ref_count.h"
- #include "webrtc/system_wrappers/interface/trace.h"
+ #include "webrtc/system_wrappers/include/trace.h"
+ 
+@@ -33,6 +36,15 @@
+ #define BUF_LEN     ( 1024 * ( EVENT_SIZE + 16 ) )
+ #endif
  
 +#ifdef HAVE_LIBV4L2
 +#define open  v4l2_open
@@ -21,10 +24,11 @@ $NetBSD: patch-media_webrtc_trunk_webrtc
 +#define mmap  v4l2_mmap
 +#define munmap        v4l2_munmap
 +#endif
- 
++
  namespace webrtc
  {
-@@ -136,6 +147,11 @@ int32_t DeviceInfoLinux::GetDeviceName(
+ namespace videocapturemodule
+@@ -314,6 +326,11 @@ int32_t DeviceInfoLinux::GetDeviceName(
      memset(deviceNameUTF8, 0, deviceNameLength);
      memcpy(cameraName, cap.card, sizeof(cap.card));
  
Index: pkgsrc/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc
diff -u pkgsrc/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc:1.2 
pkgsrc/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc:1.3
--- pkgsrc/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc:1.2       Sun Jan 22 12:27:22 2017
+++ pkgsrc/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc   Mon Feb 25 15:32:24 2019
@@ -1,8 +1,8 @@
-$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 $
+$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc,v 1.3 2019/02/25 15:32:24 wiz Exp $
 
---- 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.orig  2017-09-14 20:16:07.000000000 +0000
 +++ media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
-@@ -25,6 +25,9 @@
+@@ -24,6 +24,9 @@
  #else
  #include <linux/videodev2.h>
  #endif
@@ -13,8 +13,8 @@ $NetBSD: patch-media_webrtc_trunk_webrtc
  #include <new>
  
 @@ -33,6 +36,15 @@
- #include "webrtc/system_wrappers/interface/ref_count.h"
- #include "webrtc/system_wrappers/interface/trace.h"
+ #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
+ #include "webrtc/system_wrappers/include/trace.h"
  
 +#ifdef HAVE_LIBV4L2
 +#define open  v4l2_open
@@ -25,6 +25,6 @@ $NetBSD: patch-media_webrtc_trunk_webrtc
 +#define munmap        v4l2_munmap
 +#endif
 +
- namespace webrtc
- {
- namespace videocapturemodule
+ namespace webrtc {
+ namespace videocapturemodule {
+ rtc::scoped_refptr<VideoCaptureModule> VideoCaptureImpl::Create(
Index: pkgsrc/security/tor-browser/patches/patch-toolkit_library_moz.build
diff -u pkgsrc/security/tor-browser/patches/patch-toolkit_library_moz.build:1.2 pkgsrc/security/tor-browser/patches/patch-toolkit_library_moz.build:1.3
--- pkgsrc/security/tor-browser/patches/patch-toolkit_library_moz.build:1.2     Sun Jan 22 12:27:22 2017
+++ pkgsrc/security/tor-browser/patches/patch-toolkit_library_moz.build Mon Feb 25 15:32:24 2019
@@ -1,75 +1,18 @@
-$NetBSD: patch-toolkit_library_moz.build,v 1.2 2017/01/22 12:27:22 ryoon Exp $
+$NetBSD: patch-toolkit_library_moz.build,v 1.3 2019/02/25 15:32:24 wiz Exp $
 
-MOZ_GSTREAMER:
-  GSTREAMER_LIBS are linked to libxul on Darwin, while they are
-  dlopen(3)'ed at runtime on other platforms. The problem is that the
-  toolkit being cocoa isn't relevant at all. It's Darwin that needs
-  the special handling, not Cocoa.
+* Support system libraries
+* Restore OSS support
 
---- toolkit/library/moz.build.orig     2015-05-04 00:43:33.000000000 +0000
+--- toolkit/library/moz.build.orig     2018-05-03 16:58:41.000000000 +0000
 +++ toolkit/library/moz.build
-@@ -214,6 +214,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF
-     ]
- 
- OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
-+OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS']
- OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
- 
- if CONFIG['MOZ_NATIVE_JPEG']:
-@@ -225,6 +226,30 @@ if CONFIG['MOZ_NATIVE_PNG']:
- if CONFIG['MOZ_NATIVE_HUNSPELL']:
-     OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
- 
-+if CONFIG['MOZ_NATIVE_OGG']:
-+    OS_LIBS += CONFIG['MOZ_OGG_LIBS']
-+
-+if CONFIG['MOZ_NATIVE_THEORA']:
-+    OS_LIBS += CONFIG['MOZ_THEORA_LIBS']
-+
-+if CONFIG['MOZ_NATIVE_VORBIS']:
-+    OS_LIBS += CONFIG['MOZ_VORBIS_LIBS']
-+
-+if CONFIG['MOZ_NATIVE_TREMOR']:
-+    OS_LIBS += CONFIG['MOZ_TREMOR_LIBS']
-+
-+if CONFIG['MOZ_NATIVE_CELT']:
-+    OS_LIBS += CONFIG['MOZ_CELT_LIBS']
-+
-+if CONFIG['MOZ_NATIVE_OPUS']:
-+    OS_LIBS += CONFIG['MOZ_OPUS_LIBS']
-+
-+if CONFIG['MOZ_NATIVE_SPEEX']:
-+    OS_LIBS += CONFIG['MOZ_SPEEX_LIBS']
-+
-+if CONFIG['MOZ_NATIVE_SOUNDTOUCH']:
-+    OS_LIBS += CONFIG['MOZ_SOUNDTOUCH_LIBS']
-+
- if CONFIG['MOZ_NATIVE_LIBEVENT']:
-     OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
- 
-@@ -234,8 +259,14 @@ if CONFIG['MOZ_NATIVE_LIBVPX']:
+@@ -247,8 +247,8 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']:
  if not CONFIG['MOZ_TREE_PIXMAN']:
      OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
  
 -if CONFIG['MOZ_ALSA']:
 -    OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
-+if CONFIG['MOZ_NATIVE_GRAPHITE2']:
-+    OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS']
-+
-+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
-+    OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
-+
 +if CONFIG['MOZ_OSS']:
 +    OS_LIBS += CONFIG['MOZ_OSS_LIBS']
  
  if CONFIG['HAVE_CLOCK_MONOTONIC']:
      OS_LIBS += CONFIG['REALTIME_LIBS']
-@@ -365,7 +396,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
- if CONFIG['MOZ_ENABLE_QT']:
-     OS_LIBS += CONFIG['XEXT_LIBS']
- 
--if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' and CONFIG['MOZ_GSTREAMER']:
-+if CONFIG['OS_ARCH'] == 'Darwin' and CONFIG['MOZ_GSTREAMER']:
-     OS_LIBS += CONFIG['GSTREAMER_LIBS']
- 
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
Index: pkgsrc/security/tor-browser/patches/patch-xpcom_base_nscore.h
diff -u pkgsrc/security/tor-browser/patches/patch-xpcom_base_nscore.h:1.2 pkgsrc/security/tor-browser/patches/patch-xpcom_base_nscore.h:1.3
--- pkgsrc/security/tor-browser/patches/patch-xpcom_base_nscore.h:1.2   Sun Jan 22 12:27:22 2017
+++ pkgsrc/security/tor-browser/patches/patch-xpcom_base_nscore.h       Mon Feb 25 15:32:24 2019
@@ -1,13 +1,15 @@
-$NetBSD: patch-xpcom_base_nscore.h,v 1.2 2017/01/22 12:27:22 ryoon Exp $
+$NetBSD: patch-xpcom_base_nscore.h,v 1.3 2019/02/25 15:32:24 wiz Exp $
 
---- xpcom/base/nscore.h.orig   2014-05-29 23:31:50.000000000 +0000
+* Support llvm/clang
+
+--- xpcom/base/nscore.h.orig   2019-02-23 20:01:00.000000000 +0000
 +++ xpcom/base/nscore.h
-@@ -114,7 +114,7 @@
+@@ -76,7 +76,7 @@
   *           NS_HIDDEN_(int) NS_FASTCALL func2(char *foo);
   */
  
 -#if defined(__i386__) && defined(__GNUC__)
 +#if defined(__i386__) && defined(__GNUC__) && !(defined(__clang__) && __clang_major__ == 3 && __clang_minor__ == 4 && __clang_patchlevel__ == 0)
- #define NS_FASTCALL __attribute__ ((regparm (3), stdcall))
- #define NS_CONSTRUCTOR_FASTCALL __attribute__ ((regparm (3), stdcall))
+ #define NS_FASTCALL __attribute__((regparm(3), stdcall))
+ #define NS_CONSTRUCTOR_FASTCALL __attribute__((regparm(3), stdcall))
  #elif defined(XP_WIN) && !defined(_WIN64)
Index: pkgsrc/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp
diff -u pkgsrc/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp:1.2 
pkgsrc/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp:1.3
--- pkgsrc/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp:1.2 Sun Jan 22 12:27:22 2017
+++ pkgsrc/security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp     Mon Feb 25 15:32:24 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp,v 1.2 2017/01/22 12:27:22 ryoon Exp $
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp,v 1.3 2019/02/25 15:32:24 wiz 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

Index: pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc
diff -u pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc:1.1 pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc:1.2
--- pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc:1.1      Sun Jan 22 12:27:22 2017
+++ pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc  Mon Feb 25 15:32:24 2019
@@ -1,21 +1,21 @@
-$NetBSD: patch-ipc_chromium_src_base_message__pump__libevent.cc,v 1.1 2017/01/22 12:27:22 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_message__pump__libevent.cc,v 1.2 2019/02/25 15:32:24 wiz 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.orig        2019-02-23 20:00:48.000000000 +0000
 +++ ipc/chromium/src/base/message_pump_libevent.cc
-@@ -20,6 +20,7 @@
+@@ -22,6 +22,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*);
+ #if defined(_EVENT_SIZEOF_SHORT)
+ #define CHECK_EVENT_SIZEOF(TYPE, type)                \
+   static_assert(_EVENT_SIZEOF_##TYPE == sizeof(type), \
+@@ -41,6 +42,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
Index: pkgsrc/security/tor-browser/patches/patch-toolkit_xre_glxtest.cpp
diff -u pkgsrc/security/tor-browser/patches/patch-toolkit_xre_glxtest.cpp:1.1 pkgsrc/security/tor-browser/patches/patch-toolkit_xre_glxtest.cpp:1.2
--- pkgsrc/security/tor-browser/patches/patch-toolkit_xre_glxtest.cpp:1.1       Sun Jan 22 12:27:22 2017
+++ pkgsrc/security/tor-browser/patches/patch-toolkit_xre_glxtest.cpp   Mon Feb 25 15:32:24 2019
@@ -1,16 +1,16 @@
-$NetBSD: patch-toolkit_xre_glxtest.cpp,v 1.1 2017/01/22 12:27:22 ryoon Exp $
+$NetBSD: patch-toolkit_xre_glxtest.cpp,v 1.2 2019/02/25 15:32:24 wiz 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");
+--- toolkit/xre/glxtest.cpp.orig       2019-02-23 20:00:59.000000000 +0000
++++ toolkit/xre/glxtest.cpp
+@@ -116,7 +116,7 @@ void glxtest() {
+         "The MOZ_AVOID_OPENGL_ALTOGETHER environment variable is defined");
  
-   ///// Open libGL and load needed symbols /////
+     ///// Open libGL and load needed symbols /////
 -#ifdef __OpenBSD__
 +#if defined(__OpenBSD__) || defined(__NetBSD__)
-   #define LIBGL_FILENAME "libGL.so"
+ #define LIBGL_FILENAME "libGL.so"
  #else
-   #define LIBGL_FILENAME "libGL.so.1"
+ #define LIBGL_FILENAME "libGL.so.1"
Index: pkgsrc/security/tor-browser/patches/patch-xpcom_io_TorFileUtils.cpp
diff -u pkgsrc/security/tor-browser/patches/patch-xpcom_io_TorFileUtils.cpp:1.1 pkgsrc/security/tor-browser/patches/patch-xpcom_io_TorFileUtils.cpp:1.2
--- pkgsrc/security/tor-browser/patches/patch-xpcom_io_TorFileUtils.cpp:1.1     Sun Jan 22 12:27:22 2017
+++ pkgsrc/security/tor-browser/patches/patch-xpcom_io_TorFileUtils.cpp Mon Feb 25 15:32:24 2019
@@ -1,8 +1,8 @@
-$NetBSD: patch-xpcom_io_TorFileUtils.cpp,v 1.1 2017/01/22 12:27:22 ryoon Exp $
+$NetBSD: patch-xpcom_io_TorFileUtils.cpp,v 1.2 2019/02/25 15:32:24 wiz Exp $
 
---- xpcom/io/TorFileUtils.cpp.orig     2016-12-10 08:02:57.000000000 +0000
+--- xpcom/io/TorFileUtils.cpp.orig     2019-02-23 20:01:00.000000000 +0000
 +++ xpcom/io/TorFileUtils.cpp
-@@ -15,7 +15,17 @@ TorBrowser_GetUserDataDir(nsIFile *aExeF
+@@ -20,7 +20,17 @@ TorBrowser_GetUserDataDir(nsIFile *aExeF
    NS_ENSURE_ARG_POINTER(aFile);
    nsCOMPtr<nsIFile> tbDataDir;
  
@@ -17,7 +17,7 @@ $NetBSD: patch-xpcom_io_TorFileUtils.cpp
 +  nsAutoCString leafSubdir(NS_LITERAL_CSTRING("TorBrowser-Data"));
 +  rv = tbDataDir->AppendNative(leafSubdir);
 +  NS_ENSURE_SUCCESS(rv, rv);
-+#elif defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR)
++#elif TOR_BROWSER_DATA_OUTSIDE_APP_DIR
    nsAutoCString tbDataLeafName(NS_LITERAL_CSTRING("TorBrowser-Data"));
    nsCOMPtr<nsIFile> appRootDir;
    nsresult rv = GetAppRootDir(aExeFile, getter_AddRefs(appRootDir));

Added files:

Index: pkgsrc/security/tor-browser/patches/patch-.mozconfig
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-.mozconfig:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-.mozconfig        Mon Feb 25 15:32:24 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-.mozconfig,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+Disable update outside of pkgsrc infrastructure, and allow config in $HOME.
+
+--- .mozconfig.orig    2019-02-24 20:07:18.325907978 +0000
++++ .mozconfig
+@@ -13,7 +13,9 @@ ac_add_options --enable-official-brandin
+ # Let's support GTK3 for ESR60
+ ac_add_options --enable-default-toolkit=cairo-gtk3
+ 
+-ac_add_options --enable-tor-browser-update
++ac_add_options --enable-tor-browser-data-outside-app-dir
++
++ac_add_options --disable-tor-browser-update
+ ac_add_options --enable-signmar
+ ac_add_options --enable-verify-mar
+ 
Index: pkgsrc/security/tor-browser/patches/patch-browser_app_profile_firefox.js
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-browser_app_profile_firefox.js:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-browser_app_profile_firefox.js    Mon Feb 25 15:32:24 2019
@@ -0,0 +1,14 @@
+$NetBSD: patch-browser_app_profile_firefox.js,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+--- browser/app/profile/firefox.js.orig        2018-05-16 05:38:23.000000000 +0000
++++ browser/app/profile/firefox.js
+@@ -1747,3 +1747,9 @@ pref("app.shield.optoutstudies.enabled",
+ #else
+ pref("app.shield.optoutstudies.enabled", false);
+ #endif
++
++// Select UI locale from LANG/LC_MESSAGE environmental variables
++pref("intl.locale.requested", "");
++
++// Disable multiprocess window support. Workaround for PR 53273.
++pref("browser.tabs.remote.autostart", false);
Index: pkgsrc/security/tor-browser/patches/patch-build_moz.configure_old.configure
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-build_moz.configure_old.configure:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-build_moz.configure_old.configure Mon Feb 25 15:32:24 2019
@@ -0,0 +1,12 @@
+$NetBSD: patch-build_moz.configure_old.configure,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+--- build/moz.configure/old.configure.orig     2018-05-03 16:58:26.000000000 +0000
++++ build/moz.configure/old.configure
+@@ -262,6 +262,7 @@ def old_configure_options(*options):
+     '--with-nspr-prefix',
+     '--with-nss-exec-prefix',
+     '--with-nss-prefix',
++    '--with-oss',
+     '--with-pthreads',
+     '--with-qemu-exe',
+     '--with-sixgill',
Index: pkgsrc/security/tor-browser/patches/patch-build_moz.configure_rust.configure
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-build_moz.configure_rust.configure:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-build_moz.configure_rust.configure        Mon Feb 25 15:32:24 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-build_moz.configure_rust.configure,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+* Fix configure with Rust 1.29.0
+
+--- build/moz.configure/rust.configure.orig    2018-09-03 06:30:53.000000000 +0000
++++ build/moz.configure/rust.configure
+@@ -119,6 +119,8 @@ def rust_supported_targets(rustc):
+     ambiguous = set()
+     per_raw_os = {}
+     for t in out:
++        if t == 'aarch64-fuchsia' or t == 'x86_64-fuchsia':
++            t = t.replace('-', '--')
+         t = split_triplet(t, allow_unknown=True)
+         key = (t.cpu, t.endianness, t.os)
+         if key in per_os:
Index: pkgsrc/security/tor-browser/patches/patch-dom_fetch_FetchConsumer.cpp
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-dom_fetch_FetchConsumer.cpp:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-dom_fetch_FetchConsumer.cpp       Mon Feb 25 15:32:24 2019
@@ -0,0 +1,13 @@
+$NetBSD: patch-dom_fetch_FetchConsumer.cpp,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+--- dom/fetch/FetchConsumer.cpp.orig   2019-02-23 20:00:40.000000000 +0000
++++ dom/fetch/FetchConsumer.cpp
+@@ -560,7 +560,7 @@ void FetchBodyConsumer<Derived>::Continu
+ 
+   RefPtr<FetchBodyConsumer<Derived>> self = this;
+   auto autoReleaseObject =
+-      mozilla::MakeScopeExit([&] { self->ReleaseObject(); });
++      mozilla::MakeScopeExit([self] { self->ReleaseObject(); });
+ 
+   if (aShuttingDown) {
+     // If shutting down, we don't want to resolve any promise.
Index: pkgsrc/security/tor-browser/patches/patch-dom_media_CubebUtils.cpp
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-dom_media_CubebUtils.cpp:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-dom_media_CubebUtils.cpp  Mon Feb 25 15:32:24 2019
@@ -0,0 +1,13 @@
+$NetBSD: patch-dom_media_CubebUtils.cpp,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+--- dom/media/CubebUtils.cpp.orig      2019-02-23 20:00:40.000000000 +0000
++++ dom/media/CubebUtils.cpp
+@@ -143,7 +143,7 @@ const char kBrandBundleURL[] = "chrome:/
+ 
+ const char* AUDIOSTREAM_BACKEND_ID_STR[] = {
+     "jack",  "pulse",       "alsa",  "audiounit", "audioqueue", "wasapi",
+-    "winmm", "directsound", "sndio", "opensl",    "audiotrack", "kai"};
++    "winmm", "directsound", "sndio", "opensl",    "audiotrack", "kai", "oss"};
+ /* Index for failures to create an audio stream the first time. */
+ const int CUBEB_BACKEND_INIT_FAILURE_FIRST =
+     ArrayLength(AUDIOSTREAM_BACKEND_ID_STR);
Index: pkgsrc/security/tor-browser/patches/patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp      Mon Feb 25 15:32:24 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+Fix build where _LITTLE_ENDIAN is not an integer.
+
+--- gfx/angle/checkout/src/common/third_party/smhasher/src/PMurHash.cpp.orig   2018-06-05 19:47:29.000000000 +0000
++++ gfx/angle/checkout/src/common/third_party/smhasher/src/PMurHash.cpp
+@@ -91,7 +91,7 @@ on big endian machines, or a byte-by-byt
+ /* gcc 'may' define __LITTLE_ENDIAN__ or __BIG_ENDIAN__ to 1 (Note the trailing __),
+  * or even _LITTLE_ENDIAN or _BIG_ENDIAN (Note the single _ prefix) */
+ #if !defined(__BYTE_ORDER)
+-  #if defined(__LITTLE_ENDIAN__) && __LITTLE_ENDIAN__==1 || defined(_LITTLE_ENDIAN) && _LITTLE_ENDIAN==1
++  #if defined(__LITTLE_ENDIAN__) && __LITTLE_ENDIAN__-0==1 || defined(_LITTLE_ENDIAN) && _LITTLE_ENDIAN-0==1
+     #define __BYTE_ORDER __LITTLE_ENDIAN
+   #elif defined(__BIG_ENDIAN__) && __BIG_ENDIAN__==1 || defined(_BIG_ENDIAN) && _BIG_ENDIAN==1
+     #define __BYTE_ORDER __BIG_ENDIAN
Index: pkgsrc/security/tor-browser/patches/patch-gfx_webrender_src_query.rs
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-gfx_webrender_src_query.rs:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-gfx_webrender_src_query.rs        Mon Feb 25 15:32:24 2019
@@ -0,0 +1,25 @@
+$NetBSD: patch-gfx_webrender_src_query.rs,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+--- gfx/webrender/src/query.rs.orig    2018-05-03 16:58:27.000000000 +0000
++++ gfx/webrender/src/query.rs
+@@ -274,17 +274,20 @@ pub struct GpuMarker {
+ 
+ impl GpuMarker {
+     fn new(gl: &Rc<gl::Gl>, message: &str) -> Self {
++#[cfg(not(target_arch = "x86"))]
+         gl.push_group_marker_ext(message);
+         GpuMarker { gl: Rc::clone(gl) }
+     }
+ 
+     fn fire(gl: &Rc<gl::Gl>, message: &str) {
++#[cfg(not(target_arch = "x86"))]
+         gl.insert_event_marker_ext(message);
+     }
+ }
+ 
+ impl Drop for GpuMarker {
+     fn drop(&mut self) {
++#[cfg(not(target_arch = "x86"))]
+         self.gl.pop_group_marker_ext();
+     }
+ }
Index: pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_lock__impl__posix.cc
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_lock__impl__posix.cc:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-ipc_chromium_src_base_lock__impl__posix.cc        Mon Feb 25 15:32:24 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-ipc_chromium_src_base_lock__impl__posix.cc,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+- Fix build on NetBSD 7.1 (which doesn't have PTHREAD_PRIO_INHERIT)
+
+--- ipc/chromium/src/base/lock_impl_posix.cc.orig      2017-06-05 20:45:20.000000000 +0000
++++ ipc/chromium/src/base/lock_impl_posix.cc
+@@ -20,7 +20,7 @@ namespace internal {
+ // Lock::PriorityInheritanceAvailable still must be checked as the code may
+ // compile but the underlying platform still may not correctly support priority
+ // inheritance locks.
+-#if defined(OS_NACL) || defined(OS_ANDROID)
++#if defined(OS_NACL) || defined(OS_ANDROID) || (defined(__NetBSD__) && !defined(PTHREAD_PRIO_INHERIT))
+ #define PRIORITY_INHERITANCE_LOCKS_POSSIBLE() 0
+ #else
+ #define PRIORITY_INHERITANCE_LOCKS_POSSIBLE() 1
Index: pkgsrc/security/tor-browser/patches/patch-ipc_glue_CrossProcessSemaphore.h
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-ipc_glue_CrossProcessSemaphore.h:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-ipc_glue_CrossProcessSemaphore.h  Mon Feb 25 15:32:24 2019
@@ -0,0 +1,21 @@
+$NetBSD: patch-ipc_glue_CrossProcessSemaphore.h,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+- avoid use of sem_t on NetBSD
+  http://mail-index.netbsd.org/pkgsrc-bugs/2017/06/23/msg062225.html
+
+--- ipc/glue/CrossProcessSemaphore.h.orig      2017-06-05 20:45:20.000000000 +0000
++++ ipc/glue/CrossProcessSemaphore.h
+@@ -91,7 +91,13 @@ private:
+   HANDLE mSemaphore;
+ #elif !defined(OS_MACOSX)
+   RefPtr<mozilla::ipc::SharedMemoryBasic> mSharedBuffer;
++#if defined(__NetBSD__)
++  pthread_mutex_t* mMutex;
++  pthread_cond_t* mNotZero;
++  uint32_t* mValue;
++#else
+   sem_t* mSemaphore;
++#endif
+   mozilla::Atomic<int32_t>* mRefCount;
+ #endif
+ };
Index: pkgsrc/security/tor-browser/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp Mon Feb 25 15:32:24 2019
@@ -0,0 +1,190 @@
+$NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+- avoid use of sem_t on NetBSD
+  http://mail-index.netbsd.org/pkgsrc-bugs/2017/06/23/msg062225.html
+
+--- ipc/glue/CrossProcessSemaphore_posix.cpp.orig      2019-02-23 20:00:48.000000000 +0000
++++ ipc/glue/CrossProcessSemaphore_posix.cpp
+@@ -9,6 +9,11 @@
+ #include "nsDebug.h"
+ #include "nsISupportsImpl.h"
+ #include <errno.h>
++#if defined(__NetBSD__)
++#include <iostream>
++#include <unistd.h>
++#include <limits>
++#endif
+ 
+ static const uint64_t kNsPerMs = 1000000;
+ static const uint64_t kNsPerSec = 1000000000;
+@@ -16,7 +21,13 @@ static const uint64_t kNsPerSec = 100000
+ namespace {
+ 
+ struct SemaphoreData {
++#if defined(__NetBSD__)
++  pthread_mutex_t mMutex;
++  pthread_cond_t mNotZero;
++  uint32_t mValue;
++#else
+   sem_t mSemaphore;
++#endif
+   mozilla::Atomic<int32_t> mRefCount;
+   uint32_t mInitialValue;
+ };
+@@ -42,13 +53,27 @@ namespace mozilla {
+     return nullptr;
+   }
+ 
++#if defined(__NetBSD__)
++  data->mValue = aInitialValue;
++  if (pthread_mutex_init(&data->mMutex, NULL) ||
++      pthread_cond_init(&data->mNotZero, NULL) ) {
++    return nullptr;
++  }
++#else
+   if (sem_init(&data->mSemaphore, 1, aInitialValue)) {
+     return nullptr;
+   }
++#endif
+ 
+   CrossProcessSemaphore* sem = new CrossProcessSemaphore;
+   sem->mSharedBuffer = sharedBuffer;
++#if defined(__NetBSD__)
++  sem->mMutex = &data->mMutex;
++  sem->mNotZero = &data->mNotZero;
++  sem->mValue = &data->mValue;
++#else
+   sem->mSemaphore = &data->mSemaphore;
++#endif
+   sem->mRefCount = &data->mRefCount;
+   *sem->mRefCount = 1;
+ 
+@@ -83,23 +108,44 @@ namespace mozilla {
+ 
+   int32_t oldCount = data->mRefCount++;
+   if (oldCount == 0) {
++#if defined(__NetBSD__)
++    if (pthread_mutex_init(&data->mMutex, NULL) ||
++        pthread_cond_init(&data->mNotZero, NULL) ) {
++      data->mRefCount--;
++      return nullptr;
++    }
++#else
+     // The other side has already let go of their CrossProcessSemaphore, so now
+     // mSemaphore is garbage. We need to re-initialize it.
+     if (sem_init(&data->mSemaphore, 1, data->mInitialValue)) {
+       data->mRefCount--;
+       return nullptr;
+     }
++#endif
+   }
+ 
+   CrossProcessSemaphore* sem = new CrossProcessSemaphore;
+   sem->mSharedBuffer = sharedBuffer;
++#if defined(__NetBSD__)
++  sem->mMutex = &data->mMutex;
++  sem->mNotZero = &data->mNotZero;
++  sem->mValue = &data->mValue;
++#else
+   sem->mSemaphore = &data->mSemaphore;
++#endif
+   sem->mRefCount = &data->mRefCount;
+   return sem;
+ }
+ 
+ CrossProcessSemaphore::CrossProcessSemaphore()
+-    : mSemaphore(nullptr), mRefCount(nullptr) {
++#if defined(__NetBSD__)
++    : mMutex (nullptr)
++    , mNotZero (nullptr)
++    , mValue (nullptr)
++#else
++    : mSemaphore(nullptr)
++#endif
++     , mRefCount(nullptr) {
+   MOZ_COUNT_CTOR(CrossProcessSemaphore);
+ }
+ 
+@@ -108,16 +154,57 @@ CrossProcessSemaphore::~CrossProcessSema
+ 
+   if (oldCount == 0) {
+     // Nothing can be done if the destroy fails so ignore return code.
++#if defined(__NetBSD__)
++    (void)pthread_cond_destroy(mNotZero);
++    (void)pthread_mutex_destroy(mMutex);
++#else
+     Unused << sem_destroy(mSemaphore);
++#endif
+   }
+ 
+   MOZ_COUNT_DTOR(CrossProcessSemaphore);
+ }
+ 
++#if defined(__NetBSD__)
++static struct timespec
++makeAbsTime(const Maybe<TimeDuration>& aWaitTime) {
++  struct timespec ts;
++  if (aWaitTime.isSome()) {
++    clock_gettime(CLOCK_REALTIME, &ts);
++    ts.tv_nsec += (kNsPerMs * aWaitTime->ToMilliseconds());
++    ts.tv_sec += ts.tv_nsec / kNsPerSec;
++    ts.tv_nsec %= kNsPerSec;
++  }
++  else {
++    ts.tv_sec = std::numeric_limits<time_t>::max();
++    ts.tv_nsec = 0;
++  }
++  return ts;
++}
++#endif
++
+ bool CrossProcessSemaphore::Wait(const Maybe<TimeDuration>& aWaitTime) {
+   MOZ_ASSERT(*mRefCount > 0,
+              "Attempting to wait on a semaphore with zero ref count");
+   int ret;
++#if defined(__NetBSD__)
++  struct timespec ts = makeAbsTime(aWaitTime);
++
++  ret = pthread_mutex_lock(mMutex);
++
++  if (ret == 0) {
++    while (ret == 0 && mValue == 0) {
++      ret = pthread_cond_timedwait(mNotZero, mMutex, &ts);
++      while (ret == -1 && errno == EINTR) {
++        ret = pthread_cond_timedwait(mNotZero, mMutex, &ts);
++      }
++    }
++    if (ret == 0) {
++      --(*mValue);
++    }
++    pthread_mutex_unlock(mMutex);
++  }
++#else
+   if (aWaitTime.isSome()) {
+     struct timespec ts;
+     if (clock_gettime(CLOCK_REALTIME, &ts) == -1) {
+@@ -134,13 +221,24 @@ bool CrossProcessSemaphore::Wait(const M
+     while ((ret = sem_wait(mSemaphore)) == -1 && errno == EINTR) {
+     }
+   }
++#endif
+   return ret == 0;
+ }
+ 
+ void CrossProcessSemaphore::Signal() {
+   MOZ_ASSERT(*mRefCount > 0,
+              "Attempting to signal a semaphore with zero ref count");
++#if defined(__NetBSD__)
++  int ret;
++  ret = pthread_mutex_lock(mMutex);
++  if (ret == 0) {
++    ++(*mValue);
++    pthread_cond_signal(mNotZero);
++    pthread_mutex_unlock(mMutex);
++  }
++#else
+   sem_post(mSemaphore);
++#endif
+ }
+ 
+ CrossProcessSemaphoreHandle CrossProcessSemaphore::ShareToProcess(
Index: pkgsrc/security/tor-browser/patches/patch-js_src_gc_Memory.cpp
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-js_src_gc_Memory.cpp:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-js_src_gc_Memory.cpp      Mon Feb 25 15:32:24 2019
@@ -0,0 +1,23 @@
+$NetBSD: patch-js_src_gc_Memory.cpp,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+Support SunOS/x86_64.
+
+--- js/src/gc/Memory.cpp.orig  2019-02-23 20:00:48.000000000 +0000
++++ js/src/gc/Memory.cpp
+@@ -419,6 +419,7 @@ static inline void* MapMemoryAt(void* de
+                                 off_t offset = 0) {
+ 
+ #if defined(__ia64__) || defined(__aarch64__) ||  \
++    (defined(__sun) && defined(__x86_64__)) || \
+     (defined(__sparc__) && defined(__arch64__) && \
+      (defined(__NetBSD__) || defined(__linux__)))
+   MOZ_ASSERT((0xffff800000000000ULL & (uintptr_t(desired) + length - 1)) == 0);
+@@ -468,7 +469,7 @@ static inline void* MapMemory(size_t len
+   }
+   return region;
+ #elif defined(__aarch64__) || \
+-    (defined(__sparc__) && defined(__arch64__) && defined(__linux__))
++    (defined(__sparc__) && defined(__arch64__) && defined(__linux__)) || (defined(__sun) && defined(__x86_64__))
+   /*
+    * There might be similar virtual address issue on arm64 which depends on
+    * hardware and kernel configurations. But the work around is slightly
Index: pkgsrc/security/tor-browser/patches/patch-js_src_threading_posix_Thread.cpp
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-js_src_threading_posix_Thread.cpp:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-js_src_threading_posix_Thread.cpp Mon Feb 25 15:32:24 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-js_src_threading_posix_Thread.cpp,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+Support SunOS.
+
+--- js/src/threading/posix/Thread.cpp.orig     2018-06-05 19:47:32.000000000 +0000
++++ js/src/threading/posix/Thread.cpp
+@@ -194,6 +194,8 @@ js::ThisThread::SetName(const char* name
+   rv = 0;
+ #elif defined(__NetBSD__)
+   rv = pthread_setname_np(pthread_self(), "%s", (void*)name);
++#elif defined(__sun)
++  rv = 0;
+ #else
+   rv = pthread_setname_np(pthread_self(), name);
+ #endif
Index: pkgsrc/security/tor-browser/patches/patch-js_src_util_NativeStack.cpp
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-js_src_util_NativeStack.cpp:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-js_src_util_NativeStack.cpp       Mon Feb 25 15:32:24 2019
@@ -0,0 +1,23 @@
+$NetBSD: patch-js_src_util_NativeStack.cpp,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+Support SunOS.
+
+--- js/src/util/NativeStack.cpp.orig   2019-02-23 20:00:48.000000000 +0000
++++ js/src/util/NativeStack.cpp
+@@ -40,7 +40,7 @@ void* js::GetNativeStackBaseImpl() {
+   return static_cast<void*>(pTib->StackBase);
+ }
+ 
+-#elif defined(SOLARIS)
++#elif defined(__sun)
+ 
+ JS_STATIC_ASSERT(JS_STACK_GROWTH_DIRECTION < 0);
+ 
+@@ -86,6 +86,7 @@ void* js::GetNativeStackBaseImpl() {
+     return stackBase;
+   }
+ 
++#  elif defined(__sun)
+   // Non-main threads have the required info stored in memory, so no filesystem
+   // calls are made.
+   pthread_t thread = pthread_self();
Index: pkgsrc/security/tor-browser/patches/patch-js_src_wasm_WasmSignalHandlers.cpp
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-js_src_wasm_WasmSignalHandlers.cpp:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-js_src_wasm_WasmSignalHandlers.cpp        Mon Feb 25 15:32:24 2019
@@ -0,0 +1,14 @@
+$NetBSD: patch-js_src_wasm_WasmSignalHandlers.cpp,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+Support SunOS.
+
+--- js/src/wasm/WasmSignalHandlers.cpp.orig    2019-02-23 20:00:48.000000000 +0000
++++ js/src/wasm/WasmSignalHandlers.cpp
+@@ -135,6 +135,7 @@ struct AutoSignalHandler {
+ #else
+ #define XMM_sig(p, i) ((p)->uc_mcontext.fpregs.fp_reg_set.fpchip_state.xmm[i])
+ #define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_PC])
++#  include <sys/regset.h>
+ #define EBP_sig(p) ((p)->uc_mcontext.gregs[REG_EBP])
+ #define ESP_sig(p) ((p)->uc_mcontext.gregs[REG_ESP])
+ #endif
Index: pkgsrc/security/tor-browser/patches/patch-media_libcubeb_gtest_moz.build
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-media_libcubeb_gtest_moz.build:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-media_libcubeb_gtest_moz.build    Mon Feb 25 15:32:24 2019
@@ -0,0 +1,12 @@
+$NetBSD: patch-media_libcubeb_gtest_moz.build,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+--- media/libcubeb/gtest/moz.build.orig        2018-03-10 02:54:17.000000000 +0000
++++ media/libcubeb/gtest/moz.build
+@@ -72,7 +72,6 @@ elif CONFIG['OS_TARGET'] == 'OpenBSD':
+         'sndio',
+     ]
+ else:
+-    OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
+     OS_LIBS += CONFIG['MOZ_PULSEAUDIO_LIBS']
+ 
+ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
Index: pkgsrc/security/tor-browser/patches/patch-media_libcubeb_update.sh
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-media_libcubeb_update.sh:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-media_libcubeb_update.sh  Mon Feb 25 15:32:24 2019
@@ -0,0 +1,12 @@
+$NetBSD: patch-media_libcubeb_update.sh,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+--- media/libcubeb/update.sh.orig      2018-05-03 16:58:30.000000000 +0000
++++ media/libcubeb/update.sh
+@@ -20,6 +20,7 @@ cp $1/src/cubeb_log.h src
+ cp $1/src/cubeb_mixer.cpp src
+ cp $1/src/cubeb_mixer.h src
+ cp $1/src/cubeb_opensl.c src
++cp $1/src/cubeb_oss.c src
+ cp $1/src/cubeb-jni.cpp src
+ cp $1/src/cubeb-jni.h src
+ cp $1/src/android/cubeb-output-latency.h src/android
Index: pkgsrc/security/tor-browser/patches/patch-media_libyuv_libyuv_source_mjpeg__decoder.cc
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-media_libyuv_libyuv_source_mjpeg__decoder.cc:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-media_libyuv_libyuv_source_mjpeg__decoder.cc      Mon Feb 25 15:32:24 2019
@@ -0,0 +1,13 @@
+$NetBSD: patch-media_libyuv_libyuv_source_mjpeg__decoder.cc,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+--- media/libyuv/libyuv/source/mjpeg_decoder.cc.orig   2017-06-05 20:45:14.000000000 +0000
++++ media/libyuv/libyuv/source/mjpeg_decoder.cc
+@@ -25,7 +25,7 @@
+ #endif
+ 
+ #endif
+-struct FILE;  // For jpeglib.h.
++//struct FILE;  // For jpeglib.h.
+ 
+ // C++ build requires extern C for jpeg internals.
+ #ifdef __cplusplus
Index: pkgsrc/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_audio__device_linux_audio__device__alsa__linux.cc
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_audio__device_linux_audio__device__alsa__linux.cc:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_audio__device_linux_audio__device__alsa__linux.cc       Mon Feb 25 15:32:24 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-media_webrtc_trunk_webrtc_modules_audio__device_linux_audio__device__alsa__linux.cc,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+* If ESTRPIPE is not defined, use EPIPE instead. For example under NetBSD.
+
+--- media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc.orig       2018-03-10 02:54:17.000000000 +0000
++++ media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc
+@@ -60,6 +60,10 @@ static const unsigned int ALSA_CAPTURE_W
+ #define FUNC_GET_DEVICE_NAME 1
+ #define FUNC_GET_DEVICE_NAME_FOR_AN_ENUM 2
+ 
++#if !defined(ESTRPIPE)
++#define ESTRPIPE EPIPE
++#endif
++
+ AudioDeviceLinuxALSA::AudioDeviceLinuxALSA(const int32_t id) :
+     _ptrAudioBuffer(NULL),
+     _critSect(*CriticalSectionWrapper::CreateCriticalSection()),
Index: pkgsrc/security/tor-browser/patches/patch-modules_pdfium_update.sh
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-modules_pdfium_update.sh:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-modules_pdfium_update.sh  Mon Feb 25 15:32:24 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-modules_pdfium_update.sh,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+--- modules/pdfium/update.sh.orig      2018-03-10 02:54:17.000000000 +0000
++++ modules/pdfium/update.sh
+@@ -132,9 +132,9 @@ update_readme() {
+     perl -p -i -e "s/${PREFIX} [0-9A-Fa-f]+ \(.+\)/${PREFIX} ${COMMIT} (${COMMIT_DATE})/" README_MOZILLA
+ }
+ 
+-if [ "$#" == 0 ]; then
++if [ "$#" = 0 ]; then
+     COMMIT_SELECTOR="master"
+-elif [ "$#" == 2 -a "$1" == "--commit" ]; then
++elif [ "$#" = 2 -a "$1" = "--commit" ]; then
+     COMMIT_SELECTOR="$2"
+ else
+     print_help
Index: pkgsrc/security/tor-browser/patches/patch-servo_components_style_build__gecko.rs
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-servo_components_style_build__gecko.rs:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-servo_components_style_build__gecko.rs    Mon Feb 25 15:32:24 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-servo_components_style_build__gecko.rs,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+* Fix build with __uint32_t etc. not found errors on NetBSD/amd64 8.99.2
+
+--- servo/components/style/build_gecko.rs.orig 2017-09-14 20:15:56.000000000 +0000
++++ servo/components/style/build_gecko.rs
+@@ -546,6 +546,8 @@ mod bindings {
+                 .borrowed_type(ty)
+                 .zero_size_type(ty, &structs_types);
+         }
++        builder = builder
++            .raw_line(format!("pub use gecko_bindings::structs::root::*;"));
+         write_binding_file(builder, BINDINGS_FILE, &fixups);
+     }
+ 
Index: pkgsrc/security/tor-browser/patches/patch-toolkit_components_terminator_nsTerminator.cpp
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-toolkit_components_terminator_nsTerminator.cpp:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-toolkit_components_terminator_nsTerminator.cpp    Mon Feb 25 15:32:24 2019
@@ -0,0 +1,27 @@
+$NetBSD: patch-toolkit_components_terminator_nsTerminator.cpp,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+* Fix segfault on exit under NetBSD
+
+--- toolkit/components/terminator/nsTerminator.cpp.orig        2016-06-15 21:54:53.514370128 +0000
++++ toolkit/components/terminator/nsTerminator.cpp
+@@ -36,7 +36,7 @@
+ #if defined(XP_WIN)
+ #include <windows.h>
+ #else
+-#include <unistd.h>
++#include <time.h>
+ #endif
+ 
+ #include "mozilla/ArrayUtils.h"
+@@ -147,7 +147,10 @@ RunWatchdog(void* arg)
+ #if defined(XP_WIN)
+     Sleep(1000 /* ms */);
+ #else
+-    usleep(1000000 /* usec */);
++    struct timespec tickd;
++    tickd.tv_sec = 1;
++    tickd.tv_nsec = 0;
++    nanosleep(&tickd, NULL);
+ #endif
+ 
+     if (gHeartbeat++ < timeToLive) {
Index: pkgsrc/security/tor-browser/patches/patch-toolkit_moz.configure
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-toolkit_moz.configure:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-toolkit_moz.configure     Mon Feb 25 15:32:24 2019
@@ -0,0 +1,23 @@
+$NetBSD: patch-toolkit_moz.configure,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+* skia part: support bigendian architectures
+
+--- toolkit/moz.configure.orig 2018-05-03 16:58:41.000000000 +0000
++++ toolkit/moz.configure
+@@ -932,11 +932,11 @@ include('nss.configure')
+ # ==============================================================
+ option('--disable-skia', help='Disable use of Skia')
+ 
+-@depends('--disable-skia')
+-def skia(value):
+-    if not value:
+-        die('--disable-skia is not supported anymore')
+-    else:
++@depends('--disable-skia', target)
++def skia(value, target):
++    if value.origin == 'default' and target.endianness == 'big':
++        return None
++    if value:
+         return True
+ 
+ set_config('MOZ_ENABLE_SKIA', skia)
Index: pkgsrc/security/tor-browser/patches/patch-toolkit_mozapps_installer_packager.mk
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-toolkit_mozapps_installer_packager.mk:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-toolkit_mozapps_installer_packager.mk     Mon Feb 25 15:32:24 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-toolkit_mozapps_installer_packager.mk,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+* Symbolic link to lib/firefox/firefox causes 'Couldn't load XPCOM.' error.
+
+--- toolkit/mozapps/installer/packager.mk.orig 2018-01-11 20:17:05.000000000 +0000
++++ toolkit/mozapps/installer/packager.mk
+@@ -137,7 +137,7 @@ endif
+         (cd $(DESTDIR)$(installdir) && tar -xf -)
+       $(NSINSTALL) -D $(DESTDIR)$(bindir)
+       $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
+-      ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
++      #ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
+ 
+ checksum:
+       mkdir -p `dirname $(CHECKSUM_FILE)`
Index: pkgsrc/security/tor-browser/patches/patch-xpcom_build_BinaryPath.h
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-xpcom_build_BinaryPath.h:1.1
--- /dev/null   Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-xpcom_build_BinaryPath.h  Mon Feb 25 15:32:24 2019
@@ -0,0 +1,39 @@
+$NetBSD: patch-xpcom_build_BinaryPath.h,v 1.1 2019/02/25 15:32:24 wiz Exp $
+
+* Fix build under netbsd-7, PR pkg/52956
+
+--- xpcom/build/BinaryPath.h.orig      2019-02-23 20:01:00.000000000 +0000
++++ xpcom/build/BinaryPath.h
+@@ -21,7 +21,8 @@
+     defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #include <sys/sysctl.h>
+ #endif
+-#if defined(__OpenBSD__)
++#if defined(__OpenBSD__) || \
++    (defined(__NetBSD__) && !defined(KERN_PROC_PATHNAME))
+ #include <sys/stat.h>
+ #endif
+ #include "mozilla/UniquePtr.h"
+@@ -164,7 +165,7 @@ class BinaryPath {
+   }
+ 
+ #elif defined(__FreeBSD__) || defined(__DragonFly__) || \
+-    defined(__FreeBSD_kernel__) || defined(__NetBSD__)
++    defined(__FreeBSD_kernel__) || (defined(__NetBSD__) && defined(KERN_PROC_PATHNAME))
+   static nsresult Get(char aResult[MAXPATHLEN]) {
+     int mib[4];
+     mib[0] = CTL_KERN;
+@@ -246,6 +247,13 @@ class BinaryPath {
+     return NS_ERROR_FAILURE;
+   }
+ 
++#elif (defined(__NetBSD__) && !defined(KERN_PROC_PATHNAME))
++  static nsresult Get(char aResult[MAXPATHLEN])
++  {
++    char path[] = "@PREFIX@/lib/firefox60/firefox60";
++    sprintf(aResult, "%s", path);
++    return NS_OK;
++  }
+ #else
+ #error Oops, you need platform-specific code here
+ #endif



Home | Main Index | Thread Index | Old Index