Bug 995321 - nsIDocumentEncoder.encodeToString should offer a way to limit the size of the output, r=smaug.
Bug 971048 - Run language detection on webpages and display infobar when language is not the current UI locale, r=felipe.
Bug 997406 - Default to Link context menu items in context menus. r=bnicholson
Bug 989137 - Part 12: Ability to ignore hashes of downloaded experiments; r=gfritzsche

We normally validate hashes of XPIs as part of installing experiments.
While a useful security feature, this patch makes that optional. This in
turn makes automated and manual testing easier.

--HG--
extra : rebase_source : 292653411391843fad3f62d0bee01e11779313b6
Bug 989137 - Part 13: Rename functions for associating with Add-on Manager; r=gfritzsche

The previous experiment feature expands the scope of these functions. A
rename was in order.

--HG--
extra : rebase_source : 054d7a440e3e15436ff7fbcbc4f91b28dd4fc9fd
Bug 989137 - Part 14: Return a promise from Experiments.init(); r=gfritzsche

Upcoming tests will need to wait on init() to finish before running. We
now return a promise so these tests don't have to look at internal
variables.

--HG--
extra : rebase_source : 487645efe419fb3fa3371f85a81e8f3e1ccd9012
extra : amend_source : 3d6bb785e0ecdabcbff1e5bc62ee7dc56cbb7244
extra : histedit_source : 8d12f7e5c47995a408509a85a527bc86f9a76ccb
Bug 989137 - Part 15: Convert browser_experiments.js to add_task; r=Unfocused

Upcoming tests rely heavily on promises. I just learned that browser
chrome tests support add_task() as an alternative to test(). This patch
ports the browser_experiments.js test and utilized utility functions
to use add_task() and promises.

--HG--
extra : rebase_source : 434b7dc0e899fef0c508d5dd01438514da519ba3
extra : histedit_source : 517043f2bbe7a22bd53e8ae0c77f585ac107f6c9
Backout 47845138fae1 (bug 996148) because the solution from bug 997227 is better. r=backout.
Bug 997227 - Entering and exiting tabview makes items in tabs toolbar collide with fullscreen button. r=Gijs, MattN.
Bug 985868 - only report prolonged sync errors once per application invocation. r=rnewman
Merge m-c to fx-team.
Bug 996121 - Bouncing unicorn easter egg (in hamburger menu) briefly triggers scrollbar each time it hits the bottom of its bounce area when the font-size is not 12px. r=mconley
Updated 7Zip moz modifications to sfx code - Bug 396050 - [7zip] Unnecessary Button provided by the 7-Zip SEA (self extracting archive). r=bbondy
Updated 7Zip sfx - Bug 396050 - [7zip] Unnecessary Button provided by the 7-Zip SEA (self extracting archive). r=bbondy
Updated 7Zip moz modifications to sfx code - Bug 995891 - Reduce stub installer install timeouts. r=tabraldes
Updated 7Zip sfxthat include moz modifications  - Bug 995891 - Reduce stub installer install timeouts. r=me
merge fx-team to  mozilla-central