Bug 923248 - Fix typo in proxy/direct NTLM module telemetry accumulation, r=jduell
Bug 922395 - OdinMonkey: move the check for generators (r=jorendorff)

--HG--
extra : rebase_source : ffb4753d59240a3310a4bb81077f141877e14e29