Bug 873049 - properly compare media constraints with audio and video tracks instead of streams. r=jsmith,jesup
bug 982248 - NSSCertDBTrustDomain: specify timeout for OCSP requests r=briansmith
Bug 983000 - "Intermittent test_ping_aboutnetworking.js | test failed (with xpcshell return code: 0), see following log | -1 != -1 - See following stack" r=mcmanus
Bug 999327 - Consider the wake-locks held by the main process when computing priorities. r=fabrice
Bug 1002696 - Minimum set of changes to make genHPKPStaticPins.js productionizable. r=cviecco, dkeeler

--HG--
rename : security/manager/boot/src/PreloadedHPKPins.json => security/manager/tools/PreloadedHPKPins.json
rename : security/manager/boot/src/genHPKPStaticPins.js => security/manager/tools/genHPKPStaticPins.js