commit da7faed2de78d7a0a5c84a0d8c508b9499b7bf54 Merge: 522558c 7a73984 Author: Mike Perry mikeperry-git@torproject.org Date: Tue Aug 4 13:38:34 2015 -0700

Merge remote-tracking branch 'arthur/16572' into tor-browser-38.1.0esr-5.0-1

netwerk/test/browser/browser.ini | 2 ++ netwerk/test/browser/browser_cacheFirstParty.js | 2 +- netwerk/test/browser/thirdPartyChild.iframe.html | 1 + netwerk/test/browser/thirdPartyChild.worker.js | 3 +++ netwerk/test/browser/thirdPartyChild.worker.xhr.html | 8 ++++++++ 5 files changed, 15 insertions(+), 1 deletion(-)