Bug 1416448 - Don't update the ASR during merging for an empty container item, since we can't compute the ASR of the contents. r=miko

Bug 1416028 - Prevent browser_pluginCrashedCommentAndURL.js from leaking crash dump files. r=mconley, a=test-only This patch also checks for I/O errors when deleting leftover crashdump files in the test harness and reports them if the files couldn't be deleted. This won't prevent tests from leaking crash dumps if they're not written correctly, but it will make their presence visible and won't cause the harness to hang if it cannot delete them. MozReview-Commit-ID: FLvBJxEKkH5

Bug 1378524 - Fix "TypeError: tab is null" exception raised from browser_inspector_extension_sidebar.js when running on beta. r=pbro, a=test-only MozReview-Commit-ID: DZPA07695VS

Bug 1418227 - Socket timeout is lost in TcpTransport.connect(). r=automatedtester, a=test-only The socket_timeout getter should not return the timeout directly from the socket instance, because right after socket.socket() it is set to "None" internally, which will cause the original value as requested by Marionette to be lost. MozReview-Commit-ID: DkmvvJ4bDF9

Bug 1418227 - Indicate that sock instance is private. r=automatedtester, a=test-only The sock instance in TcpTransport should not be modified by code outside of the class. As such indicate it least as private. MozReview-Commit-ID: FGgZHYj7EdV

Bug 1418227 - TcpTransport.sock should not be used by consumers. r=automatedtester, a=test-only The socket is managed by TcpTransport and as such the latter should be used to retrieve the socket timeout. MozReview-Commit-ID: EzXCwDtfGvR

no bug - Bumping Firefox l10n changesets DONTBUILD r=release a=l10n-bump ast -> 07539f339719 fi -> 8e7d6225f3b4 hr -> b5c663cfab6e id -> a3bf6ed07225 is -> 3a0d9d474dd5 it -> 62a5ce2d9dd3 ka -> 0ee65c3ad6c6 km -> 21dcf412d6d8 ml -> 861756783858 ne-NP -> d07d9aa26c8c pt-BR -> 7b818dc93e65 pt-PT -> b261c3b27495 sq -> df2a22e066ac ta -> ee19364a4ac4 tr -> 1aceb0fa25df zh-CN -> 1850efb554e6

no bug - Bumping Fennec l10n changesets DONTBUILD r=release a=l10n-bump ast -> 593527ffa6d4 fi -> 8e7d6225f3b4 id -> a3bf6ed07225 is -> cded4caf1852 ka -> 0ee65c3ad6c6 ml -> 861756783858 ne-NP -> d07d9aa26c8c oc -> d879a08887c1 pt-BR -> 7b818dc93e65 pt-PT -> 63a9d0b5244a sq -> d271c48622ec trs -> eef81cc0b272 vi -> cd9f8719e37b zh-CN -> 1850efb554e6

Backed out changesets cdaf608ce668 and 001b6191ff91 (bug 1416448) for build bustage. r=backout a=backout on a CLOSED TREE

Bug 1416448 - Don't update the ASR during merging for an empty container item, since we can't compute the ASR of the contents: fix merge conflict. r=bustage-fix a=bustage-fix on a CLOSED TREE

Bug 1412090 - patch 4 - Also adopt the ContentParent::NotifyUpdatedFonts method on macOS, so that only the parent process needs to register with CFNotificationCenter for font-changed notifications. r=lsalzman a=gchang

Bug 1412090 - patch 3 - Check the sandbox policy to verify font files will be readable by the content process before including them in the system font list. r=gps a=gchang

Bug 1412090 - patch 2.1 - Work around FcNameParse bug in fontconfig versions around 2.11.0, by escaping any leading space in the encoded charset element. r=lsalzman a=gchang

Bug 1412090 - patch 2 - Rework the fontconfig-based platform font list implementation to pass the list of available font patterns from chrome to content, instead of letting the content process get it directly from fontconfig. r=lsalzman a=gchang

Bug 1412090 - patch 1 - Wrap the font family record used to pass font info from chrome to content on macOS in a union, in preparation for using the same mechanism with a different type of font record on Linux. (No functional change here, just the added union type and some renamings from 'font family list' to 'font list' to be more generic.) r=lsalzman a=gchang

servo: Merge #19263 - selectors: Allow white space in the brackets of an attribute selector (from heycam:attr-ws); r=SimonSapin a=gchang Source-Repo: https://github.com/servo/servo Source-Revision: 7b886b4479763018ecad62aa6db96049732ca9ed

Bug 1370915 - Reorganize compatibility checks in BrowserApp and GeckoApp to avoid attempting to load mozglue on unsupported hardware. r=jchen a=gchang

Bug 1392947 - Add more credit card expiration date matching patterns to enhance prediction. r=lchang,seanlee a=gchang MozReview-Commit-ID: 3WyU6wSC8wD

Bug 1417650 - Correctly specify flags for Tab:OpenUri; r=me a=gchang Pass in the flag names for Tab:OpenUri so we don't have to worry about synchronizing the flags in Java with ones in C++. r=me for trivial patch. MozReview-Commit-ID: BowjLV1s7nT

Bug 1390856 - Fix XDR helper thread error handling. r=nbp a=gchang Make sure not to return TranscodeResult_Ok if an OOM happens while running XDR on a helper thread. Also fix OOM handling when computing BuildID. MozReview-Commit-ID: EPYNhFsclVG