From 9820d6d892aca6f3ae6b40f8267c96a1b6892342 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 21 Nov 2019 02:35:42 -0500 Subject: Update tortm-browser-button extension. * data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/128.png, data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/16.png, data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/32.png, data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/48.png, data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/64.png, data/extensions/tortm-browser-button@jeremybenthum/data/popup/popup.html, data/extensions/tortm-browser-button@jeremybenthum/lib/common.js, data/extensions/tortm-browser-button@jeremybenthum/lib/proxy.js: Update. --- .../data/icons/ON/128.png | Bin 5310 -> 6305 bytes .../data/icons/ON/16.png | Bin 531 -> 609 bytes .../data/icons/ON/32.png | Bin 1139 -> 1308 bytes .../data/icons/ON/48.png | Bin 1862 -> 2202 bytes .../data/icons/ON/64.png | Bin 2479 -> 2938 bytes .../data/popup/popup.html | 2 ++ .../tortm-browser-button@jeremybenthum/lib/common.js | 16 ++++++---------- .../tortm-browser-button@jeremybenthum/lib/proxy.js | 2 +- 8 files changed, 9 insertions(+), 11 deletions(-) (limited to 'data') diff --git a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/128.png b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/128.png index f9b870d..cb5f023 100644 Binary files a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/128.png and b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/128.png differ diff --git a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/16.png b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/16.png index 4f2ca5e..876ca33 100644 Binary files a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/16.png and b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/16.png differ diff --git a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/32.png b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/32.png index 848d8d2..bc54eff 100644 Binary files a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/32.png and b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/32.png differ diff --git a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/48.png b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/48.png index 92cb70a..2aa60cc 100644 Binary files a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/48.png and b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/48.png differ diff --git a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/64.png b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/64.png index d89242c..4a2110f 100644 Binary files a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/64.png and b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/64.png differ diff --git a/data/extensions/tortm-browser-button@jeremybenthum/data/popup/popup.html b/data/extensions/tortm-browser-button@jeremybenthum/data/popup/popup.html index 67b5be0..2a49fbc 100644 --- a/data/extensions/tortm-browser-button@jeremybenthum/data/popup/popup.html +++ b/data/extensions/tortm-browser-button@jeremybenthum/data/popup/popup.html @@ -29,6 +29,8 @@ +
+ diff --git a/data/extensions/tortm-browser-button@jeremybenthum/lib/common.js b/data/extensions/tortm-browser-button@jeremybenthum/lib/common.js index 51171b6..ae1ed5a 100644 --- a/data/extensions/tortm-browser-button@jeremybenthum/lib/common.js +++ b/data/extensions/tortm-browser-button@jeremybenthum/lib/common.js @@ -16,19 +16,15 @@ var popupsend = function () { }; var setproxy = function (callback) { - if (tor.id === "OFF") chrome.proxy.settings.set({"scope": "regular", "value": {"proxyType":"system", "mode": "system"}}, callback); + if (tor.id === "OFF") chrome.proxy.settings.set({"scope": "regular", "value": {"mode": "system"}}, callback); else chrome.proxy.settings.set({ "scope": "regular", "value": { - "proxyDNS":true, - "autoConfigUrl":"", - "socksVersion":5, - "passthrough":"", - "proxyType":"manual", - "ftp":"", - "ssl":"", - "http":"", - "socks":"127.0.0.1:9050" + "mode": "fixed_servers", + "rules": { + "bypassList": tor.bypassList, + "singleProxy": {"scheme": "socks5", "host": "127.0.0.1", "port": 9050} + } } }, callback); }; diff --git a/data/extensions/tortm-browser-button@jeremybenthum/lib/proxy.js b/data/extensions/tortm-browser-button@jeremybenthum/lib/proxy.js index 525bb5b..a8e3748 100644 --- a/data/extensions/tortm-browser-button@jeremybenthum/lib/proxy.js +++ b/data/extensions/tortm-browser-button@jeremybenthum/lib/proxy.js @@ -5,7 +5,7 @@ if (/Firefox/.test(navigator.userAgent)) { const mode = value.mode; const settings = { "autoLogin": value.noPrompt, - "proxyDNS": true, + "proxyDNS": value.remoteDNS, "autoConfigUrl": mode === 'pac_script' ? value.pacScript.url : '', "socksVersion": mode === 'fixed_servers' && value.rules.singleProxy.scheme === 'socks5' ? 5 : 4, "passthrough": mode === 'fixed_servers' && value.rules.bypassList && value.rules.bypassList.length ? value.rules.bypassList.join(', ') : '', -- cgit v1.2.3