Bug 998372 - part 1 - lift regex construction out of FindProxyForURL; r=jmaher
Bug 998372 - part 2 - lift origins out of FindProxyForURL and make origin lookups more efficient; r=jmaher
Bug 998372 - part 3 - remove swathes of conditional logic from FindProxyForURL; r=jmaher
Bug 998372 - part 4 - explain the escape-fest in permissions.py better; r=jmaher
Bug 26767 - FTP client detects UTF-8 if server returns UTF8 on FEAT. r=michal.novotny
Bug 998396: Fix gethash completions, urlclassifier.malware_table and urlclassifier.phish_table may be comma-separated lists (r=gcp)
Bug 999477: Fix FindInReadable calls in ApplicationReputation (r=gcp)
Backed out changeset 73bb0c592bf1 (bug 998396) for debug build failures; CLOSED TREE
Bug 999407 - add --setenv option for mochitests run through mach; r=jmaher


DONTBUILD because NPOTB
Bug 998507 - add BinarySearch (r=sunfish)

--HG--
extra : rebase_source : 6ba04575a5dd8a886235e6799bc790c7a3afc64f
Bug 991600 - Make sure that registering the content policy doesn't race with the call to sendBeacon; r=rbarnes
Bug 807168 - Move GCMarker into gc/Tracer.h; r=jonco

--HG--
extra : rebase_source : 031495e6bb5510009eb871866e9f5e3beda24211
Bug 807168 - Move rarely used code in GCMarker out of the header; r=jonco

--HG--
extra : rebase_source : f8895a2a2a00f31a45900cdbc718a19aed6262d9
Bug 998507 - add some assertions to BinarySearch (r=me)
Bug 998741 - Fix XULRunner builds; r=bsmedberg
Bug 946021 - Enable ARM assembly for Opus. r=ted,derf
Bug 998779 - Remove unused include of nsHashtable.h in nsMenuGroupOwnerX.mm. r=froydnj
Bug 984125 - Convert nsStringBundleService::mBundleMap to nsDataHashtable. r=ehsan
Bug 992415 - Fix null checks in FilePickerParent::Done. r=jdm
Merge m-c to inbound.