[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

2016-10-17 Thread translation 
commit 4e67480af1cef4c6850860717e20f50410c4a201
Author: Translation commit bot 
Date:   Mon Oct 17 10:46:36 2016 +

Update translations for torbutton-torbuttondtd
---
 es/torbutton.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/es/torbutton.dtd b/es/torbutton.dtd
index fa696bd..d015777 100644
--- a/es/torbutton.dtd
+++ b/es/torbutton.dtd
@@ -2,8 +2,8 @@
 
 
 
-
-
+
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

2016-10-17 Thread translation 
commit 63a2b3b22dba7ef0c9d181e790553ed04709e225
Author: Translation commit bot 
Date:   Mon Oct 17 09:46:38 2016 +

Update translations for torbutton-torbuttondtd
---
 vi/torbutton.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vi/torbutton.dtd b/vi/torbutton.dtd
index f3d7f41..a797098 100644
--- a/vi/torbutton.dtd
+++ b/vi/torbutton.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -11,7 +11,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbutton/master] Bug 20373: Prevent redundant dialogs opening

2016-10-17 Thread gk 
commit 52fbcbfa9df65d56dce5b1654c4d56012b3ff6a9
Author: Arthur Edelstein 
Date:   Sat Oct 15 19:59:16 2016 -0700

Bug 20373: Prevent redundant dialogs opening
---
 src/chrome/content/torbutton.js | 14 +++---
 src/modules/utils.js| 24 +++-
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 0f1046a..fa4009a 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -9,6 +9,7 @@
 
 let { LoadContextInfo } = 
Cu.import('resource://gre/modules/LoadContextInfo.jsm');
 let { Services } = Cu.import("resource://gre/modules/Services.jsm");
+let { showDialog } = Cu.import("resource://torbutton/modules/utils.js");
 
 const k_tb_last_browser_version_pref = 
"extensions.torbutton.lastBrowserVersion";
 const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded";
@@ -824,9 +825,7 @@ function torbutton_on_abouttor_load(aDoc) {
   label: button_label,
   accessKey: 'S',
   popup: null,
-  callback: function() {
-window.openDialog("chrome://torbutton/content/preferences.xul",
-"torbutton-preferences","chrome");}
+  callback: torbutton_open_prefs_dialog,
 }];
 
 let priority = box.PRIORITY_INFO_LOW;
@@ -2127,14 +2126,15 @@ function torbutton_check_protections()
 
 // Bug 1506 P2: I think cookie protections is a neat feature.
 function torbutton_open_cookie_dialog() {
-  window.openDialog('chrome://torbutton/content/torcookiedialog.xul','Cookie 
Protections',
-   
'centerscreen,chrome,dialog,modal,resizable');
+  showDialog(window, 'chrome://torbutton/content/torcookiedialog.xul',
+ 'Cookie Protections', 
'centerscreen,chrome,dialog,modal,resizable');
 }
 
 // Bug 1506 P2/P3: Prefs are handled differently on android, I guess?
 function torbutton_open_prefs_dialog() {
-
window.openDialog("chrome://torbutton/content/preferences.xul","torbutton-preferences","centerscreen,
 chrome");
-torbutton_log(2, 'opened preferences window');
+  showDialog(window, "chrome://torbutton/content/preferences.xul",
+ "torbutton-preferences","centerscreen, chrome");
+  torbutton_log(2, 'opened preferences window');
 }
 
 // Bug 1506 P0: Support code for checking Firefox versions. Not needed.
diff --git a/src/modules/utils.js b/src/modules/utils.js
index eb0746b..514ef51 100644
--- a/src/modules/utils.js
+++ b/src/modules/utils.js
@@ -52,5 +52,27 @@ var getEnv = function (name) {
   return env.exists(name) ? env.get(name) : undefined;
 };
 
+// ## Windows
+
+// __dialogsByName__.
+// Map of window names to dialogs.
+let dialogsByName = {};
+
+// __showDialog(parent, url, name, features, arg1, arg2, ...)__.
+// Like window.openDialog, but if the window is already
+// open, just focuses it instead of opening a new one.
+var showDialog = function (parent, url, name, features) {
+  let existingDialog = dialogsByName[name];
+  if (existingDialog && !existingDialog.closed) {
+existingDialog.focus();
+return existingDialog;
+  } else {
+let newDialog = parent.openDialog.apply(parent,
+Array.slice(arguments, 1));
+dialogsByName[name] = newDialog;
+return newDialog;
+  }
+};
+
 // Export utility functions for external use.
-let EXPORTED_SYMBOLS = ["bindPrefAndInit", "getPrefValue", "getEnv"];
+let EXPORTED_SYMBOLS = ["bindPrefAndInit", "getPrefValue", "getEnv", 
"showDialog"];

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 20304: SOCKS socket does not support spaces and other special characters

2016-10-17 Thread gk 
commit 48a73d262e04c2a90cf660445568cbcf01e83b9c
Author: Kathy Brade 
Date:   Thu Oct 6 14:09:04 2016 -0400

Bug 20304: SOCKS socket does not support spaces and other special characters

Correctly decode file URL paths before using for them in
Unix domain socket paths.

The upstream bug is https://bugzilla.mozilla.org/show_bug.cgi?id=1308275.
---
 netwerk/socket/nsSOCKSIOLayer.cpp | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/netwerk/socket/nsSOCKSIOLayer.cpp 
b/netwerk/socket/nsSOCKSIOLayer.cpp
index b26408d..be69725 100644
--- a/netwerk/socket/nsSOCKSIOLayer.cpp
+++ b/netwerk/socket/nsSOCKSIOLayer.cpp
@@ -20,6 +20,8 @@
 #include "nsICancelable.h"
 #include "nsThreadUtils.h"
 #include "nsIURL.h"
+#include "nsIFile.h"
+#include "nsNetUtil.h"
 #include "mozilla/Logging.h"
 #include "mozilla/net/DNS.h"
 #include "mozilla/unused.h"
@@ -133,17 +135,15 @@ private:
 nsresult rv;
 MOZ_ASSERT(aProxyAddr);
 
-nsCOMPtr url = do_CreateInstance(NS_STANDARDURL_CONTRACTID, 
);
+nsCOMPtr socketFile;
+rv = NS_GetFileFromURLSpec(aDomainSocketPath,
+   getter_AddRefs(socketFile));
 if (NS_WARN_IF(NS_FAILED(rv))) {
 return rv;
 }
 
-if (NS_WARN_IF(NS_FAILED(rv = url->SetSpec(aDomainSocketPath {
-return rv;
-}
-
 nsAutoCString path;
-if (NS_WARN_IF(NS_FAILED(rv = url->GetPath(path {
+if (NS_WARN_IF(NS_FAILED(rv = socketFile->GetNativePath(path {
 return rv;
 }
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbutton/master] Bug 20244.2: Remove 'disable browser plugins' checkbox

2016-10-17 Thread gk 
commit aa05941ee0144026fb843b6f5a2098aed5e17b46
Author: Arthur Edelstein 
Date:   Sun Oct 2 22:27:21 2016 -0700

Bug 20244.2: Remove 'disable browser plugins' checkbox

This patch also removes the 'extensions.torbutton.no_tor_plugin'
pref and simply uses the 'plugin.disable' pref instead.

Thanks to our patch for Bug 10280 in tor-browser.git,
buttons on the plugins section of about:addons
already let you "Enable plugins" and "Disable plugins"
(i.e., toggle the 'plugin.disable' pref).

Also it's probably better to remove this footgun in the UI.
---
 src/chrome/content/preferences.js   |  2 --
 src/chrome/content/preferences.xul  |  3 ---
 src/chrome/content/torbutton.js | 15 +++
 src/chrome/locale/af/torbutton.dtd  |  1 -
 src/chrome/locale/ak/torbutton.dtd  |  1 -
 src/chrome/locale/am/torbutton.dtd  |  1 -
 src/chrome/locale/ar/torbutton.dtd  |  1 -
 src/chrome/locale/arn/torbutton.dtd |  1 -
 src/chrome/locale/ast/torbutton.dtd |  1 -
 src/chrome/locale/az/torbutton.dtd  |  1 -
 src/chrome/locale/be/torbutton.dtd  |  1 -
 src/chrome/locale/bg/torbutton.dtd  |  1 -
 src/chrome/locale/bn-IN/torbutton.dtd   |  1 -
 src/chrome/locale/bn/torbutton.dtd  |  1 -
 src/chrome/locale/bo/torbutton.dtd  |  1 -
 src/chrome/locale/br/torbutton.dtd  |  1 -
 src/chrome/locale/bs/torbutton.dtd  |  1 -
 src/chrome/locale/ca/torbutton.dtd  |  1 -
 src/chrome/locale/cs/torbutton.dtd  |  1 -
 src/chrome/locale/csb/torbutton.dtd |  1 -
 src/chrome/locale/cy/torbutton.dtd  |  1 -
 src/chrome/locale/da/torbutton.dtd  |  1 -
 src/chrome/locale/de/torbutton.dtd  |  1 -
 src/chrome/locale/dz/torbutton.dtd  |  1 -
 src/chrome/locale/el/torbutton.dtd  |  1 -
 src/chrome/locale/en/torbutton.dtd  |  2 --
 src/chrome/locale/eo/torbutton.dtd  |  1 -
 src/chrome/locale/es/torbutton.dtd  |  1 -
 src/chrome/locale/et/torbutton.dtd  |  1 -
 src/chrome/locale/eu/torbutton.dtd  |  1 -
 src/chrome/locale/fa/torbutton.dtd  |  1 -
 src/chrome/locale/fi/torbutton.dtd  |  1 -
 src/chrome/locale/fil/torbutton.dtd |  1 -
 src/chrome/locale/fo/torbutton.dtd  |  1 -
 src/chrome/locale/fr/torbutton.dtd  |  1 -
 src/chrome/locale/fur/torbutton.dtd |  1 -
 src/chrome/locale/fy/torbutton.dtd  |  1 -
 src/chrome/locale/ga/torbutton.dtd  |  1 -
 src/chrome/locale/gl/torbutton.dtd  |  1 -
 src/chrome/locale/gu/torbutton.dtd  |  1 -
 src/chrome/locale/gun/torbutton.dtd |  1 -
 src/chrome/locale/ha/torbutton.dtd  |  1 -
 src/chrome/locale/he/torbutton.dtd  |  1 -
 src/chrome/locale/hi/torbutton.dtd  |  1 -
 src/chrome/locale/hr/torbutton.dtd  |  1 -
 src/chrome/locale/ht/torbutton.dtd  |  1 -
 src/chrome/locale/hu/torbutton.dtd  |  1 -
 src/chrome/locale/hy/torbutton.dtd  |  1 -
 src/chrome/locale/id/torbutton.dtd  |  1 -
 src/chrome/locale/is/torbutton.dtd  |  1 -
 src/chrome/locale/it/torbutton.dtd  |  1 -
 src/chrome/locale/ja/torbutton.dtd  |  1 -
 src/chrome/locale/jv/torbutton.dtd  |  1 -
 src/chrome/locale/ka/torbutton.dtd  |  1 -
 src/chrome/locale/km/torbutton.dtd  |  1 -
 src/chrome/locale/kn/torbutton.dtd  |  1 -
 src/chrome/locale/ko/torbutton.dtd  |  1 -
 src/chrome/locale/ku/torbutton.dtd  |  1 -
 src/chrome/locale/kw/torbutton.dtd  |  1 -
 src/chrome/locale/ky/torbutton.dtd  |  1 -
 src/chrome/locale/lb/torbutton.dtd  |  1 -
 src/chrome/locale/ln/torbutton.dtd  |  1 -
 src/chrome/locale/lo/torbutton.dtd  |  1 -
 src/chrome/locale/lt/torbutton.dtd  |  1 -
 src/chrome/locale/lv/torbutton.dtd  |  1 -
 src/chrome/locale/mg/torbutton.dtd  |  1 -
 src/chrome/locale/mi/torbutton.dtd  |  1 -
 src/chrome/locale/mk/torbutton.dtd  |  1 -
 src/chrome/locale/ml/torbutton.dtd  |  1 -
 src/chrome/locale/mn/torbutton.dtd  |  1 -
 src/chrome/locale/mr/torbutton.dtd  |  1 -
 src/chrome/locale/ms/torbutton.dtd  |  1 -
 src/chrome/locale/mt/torbutton.dtd  |  1 -
 src/chrome/locale/my/torbutton.dtd  |  1 -
 src/chrome/locale/nah/torbutton.dtd |  1 -
 src/chrome/locale/nap/torbutton.dtd |  1 -
 src/chrome/locale/nb/torbutton.dtd  |  1 -
 src/chrome/locale/ne/torbutton.dtd  |  1 -
 src/chrome/locale/nl/torbutton.dtd  |  1 -
 src/chrome/locale/nn/torbutton.dtd  |  1 -
 src/chrome/locale/nso/torbutton.dtd |  1 -
 src/chrome/locale/oc/torbutton.dtd  |  1 -
 src/chrome/locale/or/torbutton.dtd  |  1 -
 src/chrome/locale/pa/torbutton.dtd  |  1 -
 src/chrome/locale/pap/torbutton.dtd |  1 -
 src/chrome/locale/pl/torbutton.dtd  |  1 -
 src/chrome/locale/pms/torbutton.dtd |  1 -
 src/chrome/locale/ps/torbutton.dtd  |  1 -
 src/chrome/locale/pt-BR/torbutton.dtd   |  1 -
 src/chrome/locale/pt/torbutton.dtd  |  1 -
 src/chrome/locale/ro/torbutton.dtd

[tor-commits] [torbutton/master] Bug 20244.6: Overlay checkboxes to use torbutton translations

2016-10-17 Thread gk 
commit 7f16ada703d07b1b0140eaf12dd3e93864c14568
Author: Arthur Edelstein 
Date:   Wed Oct 5 00:15:47 2016 +

Bug 20244.6: Overlay checkboxes to use torbutton translations
---
 src/chrome.manifest  |  1 +
 src/chrome/content/privacy-prefs-overlay.xul | 13 +
 src/chrome/locale/en/torbutton.dtd   |  2 ++
 3 files changed, 16 insertions(+)

diff --git a/src/chrome.manifest b/src/chrome.manifest
index 78da042..ed3f5cf 100644
--- a/src/chrome.manifest
+++ b/src/chrome.manifest
@@ -14,6 +14,7 @@ overlay chrome://browser/content/aboutDialog.xul 
chrome://torbutton/content/abou
 
 # UI customization
 overlay chrome://browser/content/baseMenuOverlay.xul 
chrome://torbutton/content/menu-overlay.xul
+overlay about:preferences chrome://torbutton/content/privacy-prefs-overlay.xul
 
 # Strings for the about:tbupdate page
 override chrome://browser/locale/aboutTBUpdate.dtd 
chrome://torbutton/locale/aboutTBUpdate.dtd
diff --git a/src/chrome/content/privacy-prefs-overlay.xul 
b/src/chrome/content/privacy-prefs-overlay.xul
new file mode 100644
index 000..952f9b6
--- /dev/null
+++ b/src/chrome/content/privacy-prefs-overlay.xul
@@ -0,0 +1,13 @@
+
+
+
+
+http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul;>
+  
+  
+
diff --git a/src/chrome/locale/en/torbutton.dtd 
b/src/chrome/locale/en/torbutton.dtd
index 9fd9dae..0ea18e5 100644
--- a/src/chrome/locale/en/torbutton.dtd
+++ b/src/chrome/locale/en/torbutton.dtd
@@ -25,8 +25,10 @@
 
 
 
+
 
 
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 20244.2: Add "privacy.thirdparty.isolate" checkbox

2016-10-17 Thread gk 
commit e5c3cd25ed459765a91d1b364151c46afaca36c0
Author: Arthur Edelstein 
Date:   Thu Oct 6 21:09:43 2016 +

Bug 20244.2: Add "privacy.thirdparty.isolate" checkbox
---
 .../components/preferences/in-content/privacy.js   | 33 ++
 .../components/preferences/in-content/privacy.xul  | 13 +
 .../en-US/chrome/browser/preferences/privacy.dtd   |  2 ++
 3 files changed, 48 insertions(+)

diff --git a/browser/components/preferences/in-content/privacy.js 
b/browser/components/preferences/in-content/privacy.js
index 3ec0afe..69f9156 100644
--- a/browser/components/preferences/in-content/privacy.js
+++ b/browser/components/preferences/in-content/privacy.js
@@ -299,6 +299,39 @@ var gPrivacyPane = {
 }
   },
 
+  // THIRD PARTY ISOLATION
+
+  /**
+   * Converts from privacy.thirdparty.isolate pref to boolean checkbox.
+   * Note that during uplift, Mozilla changed the name to
+   * privacy.firstparty.isolate, and also changed it to a boolean,
+   * so this function is likely not needed after uplifting.
+   */
+  readThirdPartyIsolate: function ()
+  {
+var pref = document.getElementById("privacy.thirdparty.isolate");
+switch (pref.value)
+{
+  case 0: // Off
+return false;
+  case 1: // PBM only
+return true;
+  case 2: // Always
+return true;
+  default:
+return undefined;
+}
+  },
+
+  /**
+   * Convert from checkbox to private.thirdparty.isolate pref.
+   */
+  writeThirdPartyIsolate: function ()
+  {
+var checkbox = document.getElementById("thirdpartyIsolateCB");
+return checkbox.checked ? 2 : 0;
+  },
+
   // PRIVATE BROWSING
 
   /**
diff --git a/browser/components/preferences/in-content/privacy.xul 
b/browser/components/preferences/in-content/privacy.xul
index bdadcc5..d180ee2 100644
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -19,6 +19,9 @@
   
+  
   
@@ -130,6 +133,16 @@
   preference="pref.privacy.disable_button.change_blocklist"/>
 
   
+  
+
+  
+
+  
   
 
   
 
 
+
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbutton/master] Bug 20244.4: Remove 'Change details that distinguish you...' checkbox

2016-10-17 Thread gk 
commit ee88e783a98b22e743b943cc144cb6b79c70706e
Author: Arthur Edelstein 
Date:   Tue Oct 4 23:38:57 2016 +

Bug 20244.4: Remove 'Change details that distinguish you...' checkbox

Also, remove the 'extensions.torbutton.resist_fingerprinting' pref
and just use the 'privacy.resistFingerprinting' pref instead. We will
use this to implement a checkbox in the about:preferences#privacy page.
---
 src/chrome/content/preferences.js   | 2 --
 src/chrome/content/preferences.xul  | 3 ---
 src/chrome/content/torbutton.js | 6 +++---
 src/defaults/preferences/preferences.js | 2 --
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/chrome/content/preferences.js 
b/src/chrome/content/preferences.js
index b14309d..eb71019 100644
--- a/src/chrome/content/preferences.js
+++ b/src/chrome/content/preferences.js
@@ -13,7 +13,6 @@ function torbutton_prefs_init(doc) {
 var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.');
 
 // Privacy and security settings
-doc.getElementById('torbutton_resistFingerprinting').checked = 
o_torprefs.getBoolPref('resist_fingerprinting');
 let sec_slider = doc.getElementById('torbutton_sec_slider');
 let sec_custom = doc.getElementById('torbutton_sec_custom');
 let custom_values = o_torprefs.getBoolPref('security_custom');
@@ -44,7 +43,6 @@ function torbutton_prefs_save(doc) {
 
 // Privacy and Security Settings
 
-o_torprefs.setBoolPref('resist_fingerprinting', 
doc.getElementById('torbutton_resistFingerprinting').checked);
 o_torprefs.setBoolPref('security_custom',
doc.getElementById('torbutton_sec_custom').checked);
 o_torprefs.setIntPref('security_slider',
diff --git a/src/chrome/content/preferences.xul 
b/src/chrome/content/preferences.xul
index b54d799..3a54635 100644
--- a/src/chrome/content/preferences.xul
+++ b/src/chrome/content/preferences.xul
@@ -23,9 +23,6 @@
 
   
-  
 
  
   
diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index d768a9f..0f1046a 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -97,6 +97,7 @@ var torbutton_unique_pref_observer =
 this._branch.addObserver("svg", this, false);
 this._branch.addObserver("plugin.disable", this, false);
 this._branch.addObserver("privacy.thirdparty.isolate", this, false);
+this._branch.addObserver("privacy.resistFingerprinting", this, false);
 
 // We observe xpcom-category-entry-added for plugins w/ 
Gecko-Content-Viewers
 var observerService = Cc["@mozilla.org/observer-service;1"].
@@ -174,7 +175,7 @@ var torbutton_unique_pref_observer =
 case "extensions.torbutton.use_nontor_proxy":
 torbutton_use_nontor_proxy();
 break;
-case "extensions.torbutton.resist_fingerprinting":
+case "privacy.resistFingerprinting":
 case "extensions.torbutton.spoof_english":
 torbutton_update_fingerprinting_prefs();
 break;
@@ -1756,7 +1757,7 @@ function torbutton_update_disk_prefs() {
 }
 
 function torbutton_update_fingerprinting_prefs() {
-var mode = 
m_tb_prefs.getBoolPref("extensions.torbutton.resist_fingerprinting");
+var mode = m_tb_prefs.getBoolPref("privacy.resistFingerprinting");
 
 if (m_tb_tbb) {
   if (mode) {
@@ -1791,7 +1792,6 @@ function torbutton_update_fingerprinting_prefs() {
 m_tb_prefs.setBoolPref("dom.enable_performance", !mode);
 m_tb_prefs.setBoolPref("plugin.expose_full_path", !mode);
 m_tb_prefs.setBoolPref("browser.zoom.siteSpecific", !mode);
-m_tb_prefs.setBoolPref("privacy.resistFingerprinting", mode);
 
 m_tb_prefs.setBoolPref("extensions.torbutton.resize_new_windows", mode);
 
diff --git a/src/defaults/preferences/preferences.js 
b/src/defaults/preferences/preferences.js
index b9a6584..3284bde 100644
--- a/src/defaults/preferences/preferences.js
+++ b/src/defaults/preferences/preferences.js
@@ -44,8 +44,6 @@ pref("extensions.torbutton.launch_warning",true);
 // https://developer.mozilla.org/en/Addons/Working_with_AMO
 pref("extensions.torbut...@torproject.org.getAddons.cache.enabled", false);
 
-pref("extensions.torbutton.resist_fingerprinting", true);
-
 // Security Slider
 pref("extensions.torbutton.security_slider", 4);
 pref("extensions.torbutton.security_custom", false);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbutton/master] Bug 20244.5: Remove obsolete Privacy Settings group

2016-10-17 Thread gk 
commit ea0d6dc4ebc59c594162202e142549356075a981
Author: Arthur Edelstein 
Date:   Tue Oct 4 23:42:00 2016 +

Bug 20244.5: Remove obsolete Privacy Settings group
---
 src/chrome/content/preferences.js |  3 ---
 src/chrome/content/preferences.xul|  8 +++-
 src/chrome/locale/af/torbutton.dtd|  3 ---
 src/chrome/locale/ak/torbutton.dtd|  3 ---
 src/chrome/locale/am/torbutton.dtd|  3 ---
 src/chrome/locale/ar/torbutton.dtd|  5 -
 src/chrome/locale/arn/torbutton.dtd   |  3 ---
 src/chrome/locale/ast/torbutton.dtd   |  3 ---
 src/chrome/locale/az/torbutton.dtd|  3 ---
 src/chrome/locale/be/torbutton.dtd|  3 ---
 src/chrome/locale/bg/torbutton.dtd|  3 ---
 src/chrome/locale/bms/torbutton.dtd   |  2 --
 src/chrome/locale/bn-IN/torbutton.dtd |  3 ---
 src/chrome/locale/bn/torbutton.dtd|  3 ---
 src/chrome/locale/bo/torbutton.dtd|  3 ---
 src/chrome/locale/br/torbutton.dtd|  3 ---
 src/chrome/locale/bs/torbutton.dtd|  3 ---
 src/chrome/locale/ca/torbutton.dtd|  3 ---
 src/chrome/locale/cs/torbutton.dtd|  3 ---
 src/chrome/locale/csb/torbutton.dtd   |  3 ---
 src/chrome/locale/cy/torbutton.dtd|  3 ---
 src/chrome/locale/da/torbutton.dtd|  3 ---
 src/chrome/locale/de/torbutton.dtd|  5 -
 src/chrome/locale/dz/torbutton.dtd|  3 ---
 src/chrome/locale/el/torbutton.dtd|  3 ---
 src/chrome/locale/en/torbutton.dtd| 10 --
 src/chrome/locale/eo/torbutton.dtd|  3 ---
 src/chrome/locale/es/torbutton.dtd|  5 -
 src/chrome/locale/et/torbutton.dtd|  3 ---
 src/chrome/locale/eu/torbutton.dtd|  5 -
 src/chrome/locale/fa/torbutton.dtd|  5 -
 src/chrome/locale/fi/torbutton.dtd|  3 ---
 src/chrome/locale/fil/torbutton.dtd   |  3 ---
 src/chrome/locale/fo/torbutton.dtd|  3 ---
 src/chrome/locale/fr/torbutton.dtd|  5 -
 src/chrome/locale/fur/torbutton.dtd   |  3 ---
 src/chrome/locale/fy/torbutton.dtd|  3 ---
 src/chrome/locale/ga/torbutton.dtd|  3 ---
 src/chrome/locale/gl/torbutton.dtd|  3 ---
 src/chrome/locale/gu/torbutton.dtd|  3 ---
 src/chrome/locale/gun/torbutton.dtd   |  3 ---
 src/chrome/locale/ha/torbutton.dtd|  3 ---
 src/chrome/locale/he/torbutton.dtd|  3 ---
 src/chrome/locale/hi/torbutton.dtd|  3 ---
 src/chrome/locale/hr/torbutton.dtd|  3 ---
 src/chrome/locale/ht/torbutton.dtd|  3 ---
 src/chrome/locale/hu/torbutton.dtd|  3 ---
 src/chrome/locale/hy/torbutton.dtd|  3 ---
 src/chrome/locale/id/torbutton.dtd|  3 ---
 src/chrome/locale/is/torbutton.dtd|  3 ---
 src/chrome/locale/it/torbutton.dtd|  5 -
 src/chrome/locale/ja/torbutton.dtd|  5 -
 src/chrome/locale/jv/torbutton.dtd|  3 ---
 src/chrome/locale/ka/torbutton.dtd|  3 ---
 src/chrome/locale/km/torbutton.dtd|  3 ---
 src/chrome/locale/kn/torbutton.dtd|  3 ---
 src/chrome/locale/ko/torbutton.dtd|  5 -
 src/chrome/locale/ku/torbutton.dtd|  3 ---
 src/chrome/locale/kw/torbutton.dtd|  3 ---
 src/chrome/locale/ky/torbutton.dtd|  3 ---
 src/chrome/locale/lb/torbutton.dtd|  3 ---
 src/chrome/locale/lg/torbutton.dtd|  2 --
 src/chrome/locale/ln/torbutton.dtd|  3 ---
 src/chrome/locale/lo/torbutton.dtd|  3 ---
 src/chrome/locale/lt/torbutton.dtd|  3 ---
 src/chrome/locale/lv/torbutton.dtd|  3 ---
 src/chrome/locale/mg/torbutton.dtd|  3 ---
 src/chrome/locale/mi/torbutton.dtd|  3 ---
 src/chrome/locale/mk/torbutton.dtd|  3 ---
 src/chrome/locale/ml/torbutton.dtd|  3 ---
 src/chrome/locale/mn/torbutton.dtd|  3 ---
 src/chrome/locale/mr/torbutton.dtd|  3 ---
 src/chrome/locale/ms/torbutton.dtd|  3 ---
 src/chrome/locale/mt/torbutton.dtd|  3 ---
 src/chrome/locale/my/torbutton.dtd|  3 ---
 src/chrome/locale/nah/torbutton.dtd   |  3 ---
 src/chrome/locale/nap/torbutton.dtd   |  3 ---
 src/chrome/locale/nb/torbutton.dtd|  3 ---
 src/chrome/locale/ne/torbutton.dtd|  3 ---
 src/chrome/locale/nl/torbutton.dtd|  5 -
 src/chrome/locale/nn/torbutton.dtd|  3 ---
 src/chrome/locale/nso/torbutton.dtd   |  3 ---
 src/chrome/locale/oc/torbutton.dtd|  3 ---
 src/chrome/locale/or/torbutton.dtd|  3 ---
 src/chrome/locale/pa/torbutton.dtd|  3 ---
 src/chrome/locale/pap/torbutton.dtd   |  3 ---
 src/chrome/locale/pl/torbutton.dtd|  5 -
 src/chrome/locale/pms/torbutton.dtd   |  3 ---
 src/chrome/locale/ps/torbutton.dtd|  3 ---
 src/chrome/locale/pt-BR/torbutton.dtd |  3 ---
 src/chrome/locale/pt/torbutton.dtd|  5 -
 src/chrome/locale/ro/torbutton.dtd|  3 ---
 src/chrome/locale/ru/torbutton.dtd|  5 -
 src/chrome/locale/sco/torbutton.dtd   |  3 ---
 src/chrome/locale/sk/torbutton.dtd|  3 ---
 src/chrome/locale/sl/torbutton.dtd|  3 ---
 src/chrome/locale/so/torbutton.dtd|  3 ---
 src/chrome/locale/son/torbutton.dtd   |  3 ---
 src/chrome/locale/sq/torbutton.dtd|  3 ---

[tor-commits] [tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 20244.1: Add "privacy.resistFingerprinting" checkbox

2016-10-17 Thread gk 
commit 1b92582f7ef5bec693b01bc78672122add405834
Author: Arthur Edelstein 
Date:   Mon Oct 3 08:29:35 2016 +

Bug 20244.1: Add "privacy.resistFingerprinting" checkbox
---
 browser/components/preferences/in-content/privacy.xul| 11 +++
 browser/locales/en-US/chrome/browser/preferences/privacy.dtd |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/browser/components/preferences/in-content/privacy.xul 
b/browser/components/preferences/in-content/privacy.xul
index beb1800..bdadcc5 100644
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -19,6 +19,9 @@
   
+  
 
   
   
 
   
+  
+
+  
+
+  
 
 
 
diff --git a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd 
b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
index cb2dce6..ce3330e 100644
--- a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
@@ -13,6 +13,8 @@
 
 
 
+
+
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbutton/master] Bug 20244.1: Remove "block-disk" checkbox from Privacy & Security Settings

2016-10-17 Thread gk 
commit 6d785fa1bf95f997a95b867538ba3353d9a76a58
Author: Arthur Edelstein 
Date:   Sun Oct 2 21:40:33 2016 -0700

Bug 20244.1: Remove "block-disk" checkbox from Privacy & Security Settings

An equivalent checkbox, "Always use private browsing mode"
is already available in about:preferences#privacy. Better to leave
it more hidden from the user in any case, as it is inadvisable
to disable private browsing mode.

We remove the 'extensions.torbutton.block_disk' pref and use the
'browser.privatebrowsing.autostart' pref instead, because they
are equivalent.
---
 src/chrome/content/preferences.js   | 57 -
 src/chrome/content/preferences.xul  |  4 ---
 src/chrome/content/torbutton.js | 24 +++---
 src/chrome/locale/af/torbutton.dtd  |  1 -
 src/chrome/locale/ak/torbutton.dtd  |  1 -
 src/chrome/locale/am/torbutton.dtd  |  1 -
 src/chrome/locale/ar/torbutton.dtd  |  2 --
 src/chrome/locale/arn/torbutton.dtd |  1 -
 src/chrome/locale/ast/torbutton.dtd |  1 -
 src/chrome/locale/az/torbutton.dtd  |  1 -
 src/chrome/locale/be/torbutton.dtd  |  1 -
 src/chrome/locale/bg/torbutton.dtd  |  1 -
 src/chrome/locale/bn-IN/torbutton.dtd   |  1 -
 src/chrome/locale/bn/torbutton.dtd  |  1 -
 src/chrome/locale/bo/torbutton.dtd  |  1 -
 src/chrome/locale/br/torbutton.dtd  |  1 -
 src/chrome/locale/bs/torbutton.dtd  |  1 -
 src/chrome/locale/ca/torbutton.dtd  |  1 -
 src/chrome/locale/cs/torbutton.dtd  |  1 -
 src/chrome/locale/csb/torbutton.dtd |  1 -
 src/chrome/locale/cy/torbutton.dtd  |  1 -
 src/chrome/locale/da/torbutton.dtd  |  1 -
 src/chrome/locale/de/torbutton.dtd  |  2 --
 src/chrome/locale/dz/torbutton.dtd  |  1 -
 src/chrome/locale/el/torbutton.dtd  |  1 -
 src/chrome/locale/en/torbutton.dtd  |  3 --
 src/chrome/locale/eo/torbutton.dtd  |  1 -
 src/chrome/locale/es/torbutton.dtd  |  2 --
 src/chrome/locale/et/torbutton.dtd  |  1 -
 src/chrome/locale/eu/torbutton.dtd  |  2 --
 src/chrome/locale/fa/torbutton.dtd  |  2 --
 src/chrome/locale/fi/torbutton.dtd  |  1 -
 src/chrome/locale/fil/torbutton.dtd |  1 -
 src/chrome/locale/fo/torbutton.dtd  |  1 -
 src/chrome/locale/fr/torbutton.dtd  |  2 --
 src/chrome/locale/fur/torbutton.dtd |  1 -
 src/chrome/locale/fy/torbutton.dtd  |  1 -
 src/chrome/locale/ga/torbutton.dtd  |  1 -
 src/chrome/locale/gl/torbutton.dtd  |  1 -
 src/chrome/locale/gu/torbutton.dtd  |  1 -
 src/chrome/locale/gun/torbutton.dtd |  1 -
 src/chrome/locale/ha/torbutton.dtd  |  1 -
 src/chrome/locale/he/torbutton.dtd  |  1 -
 src/chrome/locale/hi/torbutton.dtd  |  1 -
 src/chrome/locale/hr/torbutton.dtd  |  1 -
 src/chrome/locale/ht/torbutton.dtd  |  1 -
 src/chrome/locale/hu/torbutton.dtd  |  1 -
 src/chrome/locale/hy/torbutton.dtd  |  1 -
 src/chrome/locale/id/torbutton.dtd  |  1 -
 src/chrome/locale/is/torbutton.dtd  |  1 -
 src/chrome/locale/it/torbutton.dtd  |  2 --
 src/chrome/locale/ja/torbutton.dtd  |  2 --
 src/chrome/locale/jv/torbutton.dtd  |  1 -
 src/chrome/locale/ka/torbutton.dtd  |  1 -
 src/chrome/locale/km/torbutton.dtd  |  1 -
 src/chrome/locale/kn/torbutton.dtd  |  1 -
 src/chrome/locale/ko/torbutton.dtd  |  2 --
 src/chrome/locale/ku/torbutton.dtd  |  1 -
 src/chrome/locale/kw/torbutton.dtd  |  1 -
 src/chrome/locale/ky/torbutton.dtd  |  1 -
 src/chrome/locale/lb/torbutton.dtd  |  1 -
 src/chrome/locale/ln/torbutton.dtd  |  1 -
 src/chrome/locale/lo/torbutton.dtd  |  1 -
 src/chrome/locale/lt/torbutton.dtd  |  1 -
 src/chrome/locale/lv/torbutton.dtd  |  1 -
 src/chrome/locale/mg/torbutton.dtd  |  1 -
 src/chrome/locale/mi/torbutton.dtd  |  1 -
 src/chrome/locale/mk/torbutton.dtd  |  1 -
 src/chrome/locale/ml/torbutton.dtd  |  1 -
 src/chrome/locale/mn/torbutton.dtd  |  1 -
 src/chrome/locale/mr/torbutton.dtd  |  1 -
 src/chrome/locale/ms/torbutton.dtd  |  1 -
 src/chrome/locale/mt/torbutton.dtd  |  1 -
 src/chrome/locale/my/torbutton.dtd  |  1 -
 src/chrome/locale/nah/torbutton.dtd |  1 -
 src/chrome/locale/nap/torbutton.dtd |  1 -
 src/chrome/locale/nb/torbutton.dtd  |  1 -
 src/chrome/locale/ne/torbutton.dtd  |  1 -
 src/chrome/locale/nl/torbutton.dtd  |  2 --
 src/chrome/locale/nn/torbutton.dtd  |  1 -
 src/chrome/locale/nso/torbutton.dtd |  1 -
 src/chrome/locale/oc/torbutton.dtd  |  1 -
 src/chrome/locale/or/torbutton.dtd  |  1 -
 src/chrome/locale/pa/torbutton.dtd  |  1 -
 src/chrome/locale/pap/torbutton.dtd |  1 -
 src/chrome/locale/pl/torbutton.dtd  |  2 --
 src/chrome/locale/pms/torbutton.dtd |  1 -
 src/chrome/locale/ps/torbutton.dtd  |  1 -
 src/chrome/locale/pt-BR/torbutton.dtd   |  1 -
 src/chrome/locale/pt/torbutton.dtd

[tor-commits] [torbutton/master] Bug 20244.3: Remove 'restrict third party cookies...' checkbox

2016-10-17 Thread gk 
commit 2978978e64fbc9164185564a19d56d5fea0b25d8
Author: Arthur Edelstein 
Date:   Tue Oct 4 23:37:19 2016 +

Bug 20244.3: Remove 'restrict third party cookies...' checkbox

Also, we remove the 'extensions.torbutton.restrict_thirdparty'
and use the 'privacy.thirdparty.isolate' pref. At the same time we
will need to add a checkbox to the about:preferences#privacy page
that toggles 'privacy.thirdparty.isolate'.

Note that 'privacy.thirdparty.isolate' will be renamed to
'privacy.firstparty.isolate' in Firefox 52.
---
 src/chrome/content/preferences.js   |  2 --
 src/chrome/content/preferences.xul  |  3 ---
 src/chrome/content/torbutton.js | 25 +
 src/defaults/preferences/preferences.js |  1 -
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/chrome/content/preferences.js 
b/src/chrome/content/preferences.js
index ad166eb..b14309d 100644
--- a/src/chrome/content/preferences.js
+++ b/src/chrome/content/preferences.js
@@ -14,7 +14,6 @@ function torbutton_prefs_init(doc) {
 
 // Privacy and security settings
 doc.getElementById('torbutton_resistFingerprinting').checked = 
o_torprefs.getBoolPref('resist_fingerprinting');
-doc.getElementById('torbutton_restrictThirdParty').checked = 
o_torprefs.getBoolPref('restrict_thirdparty');
 let sec_slider = doc.getElementById('torbutton_sec_slider');
 let sec_custom = doc.getElementById('torbutton_sec_custom');
 let custom_values = o_torprefs.getBoolPref('security_custom');
@@ -46,7 +45,6 @@ function torbutton_prefs_save(doc) {
 // Privacy and Security Settings
 
 o_torprefs.setBoolPref('resist_fingerprinting', 
doc.getElementById('torbutton_resistFingerprinting').checked);
-o_torprefs.setBoolPref('restrict_thirdparty', 
doc.getElementById('torbutton_restrictThirdParty').checked);
 o_torprefs.setBoolPref('security_custom',
doc.getElementById('torbutton_sec_custom').checked);
 o_torprefs.setIntPref('security_slider',
diff --git a/src/chrome/content/preferences.xul 
b/src/chrome/content/preferences.xul
index 1f64d09..b54d799 100644
--- a/src/chrome/content/preferences.xul
+++ b/src/chrome/content/preferences.xul
@@ -23,9 +23,6 @@
 
   
-  
   
diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 9151b8a..d768a9f 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -96,6 +96,7 @@ var torbutton_unique_pref_observer =
 this._branch.addObserver("mathml", this, false);
 this._branch.addObserver("svg", this, false);
 this._branch.addObserver("plugin.disable", this, false);
+this._branch.addObserver("privacy.thirdparty.isolate", this, false);
 
 // We observe xpcom-category-entry-added for plugins w/ 
Gecko-Content-Viewers
 var observerService = Cc["@mozilla.org/observer-service;1"].
@@ -156,11 +157,11 @@ var torbutton_unique_pref_observer =
 switch (data) {
 case "network.cookie.cookieBehavior":
 var val = 
m_tb_prefs.getIntPref("network.cookie.cookieBehavior");
-var block_thirdparty = 
m_tb_prefs.getBoolPref("extensions.torbutton.restrict_thirdparty");
+var block_thirdparty = 
m_tb_prefs.getIntPref("privacy.thirdparty.isolate") !== 0;
 if (val == 0 && block_thirdparty) // Allow all cookies
-  
m_tb_prefs.setBoolPref("extensions.torbutton.restrict_thirdparty", false);
+  m_tb_prefs.setIntPref("privacy.thirdparty.isolate", 0);
 else if (val == 1 && !block_thirdparty) // Block third party 
cookies
-  
m_tb_prefs.setBoolPref("extensions.torbutton.restrict_thirdparty", true);
+  m_tb_prefs.setIntPref("privacy.thirdparty.isolate", 2);
 break;
 
 case "plugin.disable":
@@ -177,7 +178,7 @@ var torbutton_unique_pref_observer =
 case "extensions.torbutton.spoof_english":
 torbutton_update_fingerprinting_prefs();
 break;
-case "extensions.torbutton.restrict_thirdparty":
+case "privacy.thirdparty.isolate":
 torbutton_update_thirdparty_prefs();
 break;
 case "extensions.torbutton.hide_sync_ui":
@@ -1803,24 +1804,16 @@ function torbutton_update_fingerprinting_prefs() {
 }
 
 function torbutton_update_thirdparty_prefs() {
-var mode = 
m_tb_prefs.getBoolPref("extensions.torbutton.restrict_thirdparty");
+let isolate = m_tb_prefs.getIntPref("privacy.thirdparty.isolate") !== 0;
 
-try {
-if (mode) {
-m_tb_prefs.setIntPref("privacy.thirdparty.isolate", 2);
-} else {
-m_tb_prefs.setIntPref("privacy.thirdparty.isolate", 0);
-}
-} catch(e) {}
-
-if (mode) {
+if (isolate) {

<    1   2