[tor-commits] [torbutton/master] Merge remote-tracking branch 'yawning/bug8725_take3'

[mikeperry at torproject.org]

commit 3b8e1a3508c7cb15d15c93149acab81ea8c51d9a
Merge: 7dd7101 fa67687
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Thu Jul 28 15:06:21 2016 -0700

    Merge remote-tracking branch 'yawning/bug8725_take3'

 src/chrome.manifest              |  4 ++
 src/components/content-policy.js | 83 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)