[tbb-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] Merge remote-tracking branch 'gk/bug_15758' into tor-browser-31.6.0esr-4.5-1

[mikeperry at torproject.org]

commit 89bd8f1c5b3e58dfbf9cf33692abfb2be78cd6cf
Merge: ab48482 844949e
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue Apr 21 15:29:02 2015 -0700

    Merge remote-tracking branch 'gk/bug_15758' into tor-browser-31.6.0esr-4.5-1
    
    Conflicts:
    	browser/app/profile/000-tor-browser.js

 browser/app/profile/000-tor-browser.js |    2 ++
 1 file changed, 2 insertions(+)

diff --cc browser/app/profile/000-tor-browser.js
index 7967db1,a277e9d..e7e4ca9
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@@ -87,8 -87,8 +87,10 @@@ pref("javascript.use_us_english_locale"
  // pref("intl.accept_languages", "en-us, en"); // Set by Torbutton
  // pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton
  // pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton
 +// Disable video statistics fingerprinting vector (bug 15757)
 +pref("media.video_stats.enabled", false);
+ // Disable device sensors as possible fingerprinting vector (bug 15758)
+ pref("device.sensors.enabled", false);
  
  // Third party stuff
  pref("network.cookie.cookieBehavior", 1);