- tbb-commits - lists.torproject.org

[torbutton/master] Bug 13751: Get rid of remaining SafeCache parts.
by mikeperry＠torproject.org 16 Nov '14

16 Nov '14

commit e2cce93493a857b062af83f5e8f9130fb76933a0 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 13 13:30:05 2014 +0000 Bug 13751: Get rid of remaining SafeCache parts. Additionally to getting rid of remaining SageCache parts we bump the Torbutton version to 1.8.1.1 and adapt the CHANGELOG. --- src/CHANGELOG | 3 +++ src/chrome/content/torbutton.js | 6 ------ src/install.rdf | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 4510b0c..1966ab7 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +1.8.1.1 + * Bug 13751: Get rid of remaining SafeCache parts + 1.8.1.0 * Bug 13746: Properly link Torbutton UI to thirdparty pref. * Bug 13742: Remove SafeCache code (in favor of C++ implementation) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 841dca8..2e921da 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2689,9 +2689,6 @@ function torbutton_do_main_window_startup() torbutton_unique_pref_observer.register(); - // Bug 1506: This is probably the most important observer in this function - // XXX: We should fold this into our code/move it to its own component - SSC_startup(); } // Bug 1506 P4: Most of this function is now useless, save @@ -2957,9 +2954,6 @@ function torbutton_close_window(event) { progress.removeProgressListener(torbutton_weblistener); torbutton_unique_pref_observer.unregister(); - // XXX: We should fold this into our code.. - SSC_controller.removeListener(); - if(m_tb_is_main_window) { // main window not reset above // This happens on Mac OS because they allow firefox // to still persist without a navigator window diff --git a/src/install.rdf b/src/install.rdf index 402b99c..b39f0de 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.8.1.0</em:version> + <em:version>1.8.1.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser-bundle/master] Update changelog and version file (due to #13751).
by gk＠torproject.org 13 Nov '14

13 Nov '14

commit 34f463f774ead19040933b640495cd9f875c8eb5 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 13 13:49:50 2014 +0000 Update changelog and version file (due to #13751). --- Bundle-Data/Docs/ChangeLog.txt | 6 ++++-- gitian/versions.alpha | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c8fac5c..d6926c7 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -10,7 +10,7 @@ Tor Browser 4.5-alpha-1 -- Nov 14 2014 * Bug 13742: Fix domain isolation for content cache and disk-enabled browsing mode * Update Tor to 0.2.6.1-alpha * Update NoScript to 2.6.9.3 - * Update Torbutton to 1.8.1.0 + * Update Torbutton to 1.8.1.1 * Bug 9387: Provide a "Security Slider" for vulnerability surface reduction * Bug 13019: Synchronize locale spoofing pref with our Firefox patch * Bug 3455: Use SOCKS user+pass to isolate all requests from the same url domain @@ -19,10 +19,12 @@ Tor Browser 4.5-alpha-1 -- Nov 14 2014 * Bug 13666: Various circuit status UI fixes * Bug 13742: Remove cache isolation code in favor of direct C++ patch * Bug 13746: Properly update third party isolation pref if disabled from UI + * Bug 13751: Get rid of remaining SafeCache parts * Bug 13586: Make meek use TLS session tickets (to look like stock Firefox). - * Include obfs4proxy pluggable transport + * Bug 12903: Include obfs4proxy pluggable transport * Windows * Bug 13443: Re-enable DirectShow; fix crash with mingw patch. + * Bug 13558: Fix crash on Windows XP during download folder changing * Bug 13091: Make app name "Tor Browser" instead of "Tor" * Bug 13594: Fix update failure for Windows XP users * Mac diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 953cebb..edb59c2 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -11,7 +11,7 @@ TORBROWSER_UPDATE_CHANNEL=alpha TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build6 TOR_TAG=tor-0.2.6.1-alpha TORLAUNCHER_TAG=0.2.7.0.1 -TORBUTTON_TAG=1.8.1.0 +TORBUTTON_TAG=1.8.1.1 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8

1 0

[tor-browser-bundle/master] Update changelog and versions file for bugs 13742 and 13746.
by mikeperry＠torproject.org 13 Nov '14

13 Nov '14

commit 09b07baa2238ca581c2526f002ad2fcc133d4b3f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Nov 12 20:15:32 2014 -0800 Update changelog and versions file for bugs 13742 and 13746. --- Bundle-Data/Docs/ChangeLog.txt | 7 +++++-- gitian/versions.alpha | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 988b4cd..c8fac5c 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 4.5-alpha-1 -- Nov 13 2014 +Tor Browser 4.5-alpha-1 -- Nov 14 2014 * All Platforms * Bug 3455: Patch Firefox SOCKS and proxy filters to allow user+pass isolation * Bug 11955: Backport HTTPS Certificate Pinning patches from Firefox 32 @@ -7,15 +7,18 @@ Tor Browser 4.5-alpha-1 -- Nov 13 2014 * Bug 13301: Prevent extensions incompatibility error after upgrades * Bug 13460: Fix MSVC compilation issue * Bug 13504: Remove stale bridges from default bridge set + * Bug 13742: Fix domain isolation for content cache and disk-enabled browsing mode * Update Tor to 0.2.6.1-alpha * Update NoScript to 2.6.9.3 - * Update Torbutton to 1.8.0.3 + * Update Torbutton to 1.8.1.0 * Bug 9387: Provide a "Security Slider" for vulnerability surface reduction * Bug 13019: Synchronize locale spoofing pref with our Firefox patch * Bug 3455: Use SOCKS user+pass to isolate all requests from the same url domain * Bug 8641: Create browser UI to indicate current tab's Tor circuit IPs * Bug 13651: Prevent circuit-status related UI hang. * Bug 13666: Various circuit status UI fixes + * Bug 13742: Remove cache isolation code in favor of direct C++ patch + * Bug 13746: Properly update third party isolation pref if disabled from UI * Bug 13586: Make meek use TLS session tickets (to look like stock Firefox). * Include obfs4proxy pluggable transport * Windows diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 1c4227f..953cebb 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,10 +8,10 @@ FIREFOX_VERSION=31.2.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build5 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build6 TOR_TAG=tor-0.2.6.1-alpha TORLAUNCHER_TAG=0.2.7.0.1 -TORBUTTON_TAG=1.8.0.3 +TORBUTTON_TAG=1.8.1.0 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8

1 0

[torbutton/master] Bug 13742: Remove SafeCache code (in favor of C++ implementation)
by mikeperry＠torproject.org 13 Nov '14

13 Nov '14

commit 1dedacb01855cab10835d165578575603a208cec Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Nov 12 19:38:37 2014 -0800 Bug 13742: Remove SafeCache code (in favor of C++ implementation) --- src/chrome/content/stanford-safecache.js | 448 ------------------------------ src/chrome/content/torbutton.xul | 4 - 2 files changed, 452 deletions(-) diff --git a/src/chrome/content/stanford-safecache.js b/src/chrome/content/stanford-safecache.js deleted file mode 100644 index 0ef52ad..0000000 --- a/src/chrome/content/stanford-safecache.js +++ /dev/null @@ -1,448 +0,0 @@ -// Bug 1506 P3: This file provides important cache isolation properties, -// but it is not very useful without a patched Firefox to go with it. -// It could probably also use some refactoring into an XPCOM component. -// It is currently registered from torbutton.js's "main window" observers, -// which is not the right place. - -/* - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Stanford University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// Dual-keyed cache/cookie same-origin policy -// Ensures that cache and cookies set in HTTP headers cannot be used for -// non-cooperative or semi-cooperative tracking. -// -// Author: Edward Pastuszenski -// -// Based on Stanford SafeCache -// Author: Collin Jackson -// Other contributors: Andrew Bortz, John Mitchell, Dan Boneh -// - -////////////////////////////////////////////////////////////////////////////// -// Constants - -const kSSC_ENABLED_PREF = "extensions.torbutton.safecache"; -const kSSC_SC_ENABLED_PREF = "extensions.torbutton.dual_key_cookies"; -const kSSC_TORBUTTON_PREF = "extensions.torbutton.tor_enabled"; -const kSSC_COOKIE_JS_PREF = "extensions.torbutton.cookie_js_allow"; - -//////////////////////////////////////////////////////////////////////////// -// Debug stuff - -/** - * Dump information to the console? - */ -var SSC_debug = true; - -/** - * Sends data to the console if we're in debug mode - * @param msg The string containing the message to display - */ -function SSC_dump(msg) { - if (SSC_debug) - torbutton_log(3, "SSC: " + msg); -} - -//////////////////////////////////////////////////////////////////////////// -// "Major" objects/classes - -/** - * SafeCache HTTP Request Listener - * Watches for the authentication requests and presents password dialog - */ - -function SSC_RequestListener(controller) { - this.controller = controller; - this.thirdPartyUtil = Cc["@mozilla.org/thirdpartyutil;1"]. - getService(Ci.mozIThirdPartyUtil); - this.cookie_permissions = Cc["@mozilla.org/cookie/permission;1"]. - getService(Ci.nsICookiePermission); -} - -SSC_RequestListener.prototype = -{ - controller: null, // The SSC_Controller that created this - - observe: function(subject, topic, data) { - try { - if(this.controller.getEnabled() == 2) return; - if(this.controller.getEnabled() == 1 - && !this.controller.getTorButton()) return; - if (topic == 'http-on-modify-request') { - subject.QueryInterface(Components.interfaces.nsIHttpChannel); - subject.QueryInterface(Components.interfaces.nsIHttpChannelInternal); - subject.QueryInterface(Components.interfaces.nsICachingChannel); - subject.QueryInterface(Components.interfaces.nsIChannel); - this.onModifyRequest(subject); - } else if (topic == 'http-on-examine-response') { - subject.QueryInterface(Components.interfaces.nsIHttpChannel); - subject.QueryInterface(Components.interfaces.nsIHttpChannelInternal); - subject.QueryInterface(Components.interfaces.nsICachingChannel); - subject.QueryInterface(Components.interfaces.nsIChannel); - this.onExamineResponse(subject); - } - } catch(e) {try {torbutton_log(4, "SSC: "+e);} catch(ex) {}} - }, - - bypassCache: function(channel) { - channel.loadFlags |= channel.LOAD_BYPASS_CACHE; - // INHIBIT_PERSISTENT_CACHING instead? - channel.cacheKey = this.newCacheKey(0); - SSC_dump("Bypassed cache for " + channel.URI.spec); - }, - - setCacheKey: function(channel, str) { - try { - channel.cacheDomain = str; - SSC_dump("Set cacheDomain to "+str+" for "+channel.URI.spec); - } catch(e) { - var oldData = this.readCacheKey(channel); - var newKey = this.newCacheKey(this.getHash(str) + oldData); - channel.cacheKey = newKey; - SSC_dump("Set cache key to hash(" + str + ") = " + - newKey.data + " for " + channel.URI.spec); - } - }, - - onModifyRequest: function(channel) { - var parent_host = null; - var parent_spec = null; - if (channel.notificationCallbacks || - channel.loadGroup && channel.loadGroup.notificationCallbacks) { - var callbacks = null; - if (channel.notificationCallbacks) { - callbacks = channel.notificationCallbacks; - } else { - callbacks = channel.loadGroup.notificationCallbacks; - } - try { - var wind = callbacks.QueryInterface( - Components.interfaces.nsIInterfaceRequestor).getInterface( - Components.interfaces.nsIDOMWindow); - parent_host = wind.window.top.location.hostname; - parent_spec = wind.window.top.location.href; - } catch(e) { - } - SSC_dump("Parent "+parent_host+" for "+ channel.URI.spec); - } - - if (channel.documentURI && channel.documentURI == channel.URI) { - parent_host = null; // first party interaction - parent_spec = null; - } else if(!parent_host) { - // Questionable first party interaction.. - try { - var anuri = null; - try { - anuri = this.thirdPartyUtil.getFirstPartyURIFromChannel(channel, false); - } catch (e) { - torbutton_safelog(2, "FirstParty API failed to get parent: "+e+" ", channel.URI.spec); - // We are not using the TBB based on ESR 24. Falling back to the old - // method. - anuri = this.cookie_permissions.getOriginatingURI(channel); - } - parent_host = anuri.host; - parent_spec = anuri.spec; - } catch(e) { - // XXX: This can still fail for OCSP and other windowless requests.. - torbutton_safelog(3, "Cookie API failed to get parent: "+e+" ",channel.URI.spec); - if (!channel.referrer) { - torbutton_safelog(3, "SSC: No cache isolation parent for ", channel.URI.spec); - } else { - parent_host = channel.referrer.host; - parent_spec = channel.referrer.spec; - } - } - } - - // Same-origin policy - var referrer; - if (parent_host && parent_host != channel.URI.host) { - SSC_dump("Segmenting " + channel.URI.spec + - " content loaded by " + parent_host); - this.setCacheKey(channel, parent_host); - referrer = parent_host; - try { - // Disable 3rd party http auth, but exempt the browser (for favicon loads) - // FIXME: Hrmm, this is just going to disable auth for 3rd party domains. - // It would be better if we could isolate the auth, but still - // allow it to be transmitted.. But I guess, who still uses http auth anyways? - if (channel.getRequestHeader("Authorization") !== null) { - if (parent_spec == "chrome://browser/content/browser.xul") { - torbutton_log(3, "Allowing auth for browser load of "+channel.URI.spec); - } else { - torbutton_safelog(4, "Removing 3rd party HTTP auth for url ", - channel.URI.spec+", parent: "+parent_spec); - channel.setRequestHeader("Authorization", null, false); - channel.setRequestHeader("Pragma", null, false); - channel.setRequestHeader("Cache-Control", null, false); - } - } - } catch (e) {} - } else { - referrer = channel.URI.host; - if(!this.readCacheKey(channel)) { - this.setCacheKey(channel, channel.URI.host); - } else { - SSC_dump("Existing cache key detected; leaving it unchanged."); - } - } - - if (this.controller.getBlockThirdPartyCache()) { - if(parent_host && parent_host != channel.URI.host) { - //SSC_dump("Third party cache blocked for " + channel.URI.spec + - //" content loaded by " + parent_host); - this.bypassCache(channel); - } - } - - var cookie = null; - if (this.controller.getSafeCookieEnabled()) { - try{ - cookie = channel.getRequestHeader("Cookie"); - //SSC_dump("Cookie: " + cookie); - } catch(e) {cookie = null;} - } - - if(cookie) { - //Strip the secondary key from every referrer-matched cookie - var newHeader = ""; - var i = 0; - var lastStart = 0; - //State 0: no information on next cookie - //State 1: cookie will be sent. - //State 2: cookie will not be sent. - var state = 0; - while (i < cookie.length) { - //Dual-keyed cookie - if(state == 0 && cookie.charAt(i) == '|'){ - //If referrers match, strip key and send cookie - var cookieReferrer = cookie.toString().substr(lastStart, i - lastStart); - if (referrer == cookieReferrer){ - lastStart = i+1; - state = 1; - } else { - state = 2; - } - } - //Single-keyed cookie that was set via scripting. - if (state == 0 && cookie.charAt(i) == '='){ - if(this.controller.getCookieJS()) state = 1; - else { - if (referrer == channel.getRequestHeader("Host")) state = 1; - else state = 2; - } - } - //End of a cookie - if (cookie.charAt(i) == ';') { - var thisCookie = cookie.toString().substr(lastStart, i - lastStart + 2); - if (state == 1){ - newHeader += thisCookie; - } - if (state == 2){ - SSC_dump("Declining to send " + thisCookie + - " for request by embedded domain " + channel.URI.host + - + " " + channel.getRequestHeader("Host") + - " on embedding page " + referrer); - } - lastStart = i+2; - state = 0; - } - //End of the string - if (i == cookie.length - 1){ - thisCookie = cookie.toString().substr(lastStart, i - lastStart + 1); - if (state == 1){ - newHeader += thisCookie; - } - if (state == 2){ - SSC_dump("Declining to send " + thisCookie + - " for request by embedded domain " + channel.URI.host + - + " " + channel.getRequestHeader("Host") + - " on embedding page " + referrer); - } - lastStart = i+1; - } - i++; - } - channel.setRequestHeader("Cookie", newHeader, false); - } - - }, - - onExamineResponse: function(channel) { - var setCookie; - try{ - setCookie = channel.getResponseHeader("Set-Cookie"); - } catch(e) {setCookie = null;} - - if(setCookie) { - var parent = null; - // XXX: need to use loadGroup here if null.. - if (channel.notificationCallbacks) { - var wind = channel.notificationCallbacks.QueryInterface( - Components.interfaces.nsIInterfaceRequestor).getInterface( - Components.interfaces.nsIDOMWindow); - parent = wind.window.top.location; - } - - if (channel.documentURI && channel.documentURI == channel.URI) { - parent = null; // first party interaction - } - - var referrer; - // Same-origin policy - if (parent && parent.hostname != channel.URI.host) { - //SSC_dump("Segmenting " + channel.URI.host + - //" content loaded by " + parent.host); - referrer = parent.hostname; - } else { - referrer = channel.URI.host; - } - //Dual-key each cookie set in the header - var newHeader = ""; - var i = 0; - var lastStart = 0; - //Some messy code that prevents multiple embedding-domain keys - //from being concatenated to cookie names. - var passedname = false; - var namebar = false; - while (i < setCookie.length) { - if (setCookie.charAt(i) == '=') passedname = true; - else if (setCookie.charAt(i) == '|' && passedname == false) - namebar = true; - if (i == setCookie.length - 1 || setCookie.charAt(i) == '\n'){ - if(!namebar){ - newHeader += referrer + "|" + - setCookie.toString().substr(lastStart, i - lastStart + 1); - } - lastStart = i+1; - passedname = false; - namebar = false; - } - i++; - } - //SSC_dump("MODIFIED Set-Cookie: " + newHeader); - channel.setResponseHeader("Set-Cookie", newHeader, false); - } - }, - - // Read the integer data contained in a cache key - readCacheKey: function(channel) { - try { - return channel.cacheDomain; - } catch(e) { - channel.cacheKey.QueryInterface(Components.interfaces.nsISupportsPRUint32); - return channel.cacheKey.data; - } - }, - - // Construct a new cache key with some integer data - newCacheKey: function(data) { - var cacheKey = - Components.classes["@mozilla.org/supports-PRUint32;1"] - .createInstance(Components.interfaces.nsISupportsPRUint32); - cacheKey.data = data; - return cacheKey; - }, - - strMD5: function(str) { - var converter = - Components.classes["@mozilla.org/intl/scriptableunicodeconverter"]. - createInstance(Components.interfaces.nsIScriptableUnicodeConverter); - - // nsIURI.host is UTF-8 - converter.charset = "UTF-8"; - // result.value will contain the array length - var result = {}; - // data is an array of bytes - var data = converter.convertToByteArray(str, result); - var ch = Components.classes["@mozilla.org/security/hash;1"] - .createInstance(Components.interfaces.nsICryptoHash); - ch.init(ch.MD5); - ch.update(data, data.length); - return ch.finish(false); - }, - - // Get an integer hash of a string - getHash: function(str) { - var hash = this.strMD5(str); - var intHash = 0; - for(var i = 0; i < hash.length && i < 8; i++) - intHash += hash.charCodeAt(i) << (i << 3); - return intHash; - }, -} - -/** - * Master control object. Adds and removes the RequestListener - */ -function SSC_Controller() { - this.prefs = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); - this.addListener(new SSC_RequestListener(this)); -} - -SSC_Controller.prototype = { - - getEnabled: function() { - return (this.prefs.getIntPref(kSSC_ENABLED_PREF)); - }, - - getSafeCookieEnabled: function() { - return (this.prefs.getBoolPref(kSSC_SC_ENABLED_PREF)); - }, - - getBlockThirdPartyCache: function() { - // Meh, no pref for now. Always allow. - return false; - }, - - getTorButton: function() { - return (this.prefs.getBoolPref(kSSC_TORBUTTON_PREF)); - }, - - getCookieJS: function() { - return (this.prefs.getBoolPref(kSSC_COOKIE_JS_PREF)); - }, - - addListener: function(listener) { - this.listener = listener; - var observerService = - Components.classes["@mozilla.org/observer-service;1"] - .getService(Components.interfaces.nsIObserverService); - observerService.addObserver(listener, "http-on-modify-request", false); - // XXX: We need an observer to add this listener when the pref gets set - if (this.getSafeCookieEnabled()) { - observerService.addObserver(listener, "http-on-examine-response", false); - } - }, - - removeListener: function() { - var observerService = - Components.classes["@mozilla.org/observer-service;1"] - .getService(Components.interfaces.nsIObserverService); - observerService.removeObserver(this.listener, "http-on-modify-request"); - if (this.getSafeCookieEnabled()) { - observerService.removeObserver(this.listener, "http-on-examine-response"); - } - }, -} - -//////////////////////////////////////////////////////////////////////////// -// Global stuff -// "What script would be complete without a couple of globals?" --Fritz - -var SSC_controller; - -function SSC_startup() { - if(!SSC_controller) SSC_controller = new SSC_Controller(); - SSC_dump("Loaded controller"); -} diff --git a/src/chrome/content/torbutton.xul b/src/chrome/content/torbutton.xul index 00dc6f0..95624f0 100644 --- a/src/chrome/content/torbutton.xul +++ b/src/chrome/content/torbutton.xul @@ -6,10 +6,6 @@ <overlay id="torbutton-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - -  - <script src="chrome://torbutton/content/stanford-safecache.js" /> - <script type="application/x-javascript" src="chrome://torbutton/content/torbutton_util.js" /> <script type="application/x-javascript" src="chrome://torbutton/content/tor-circuit-display.js" /> <script type="application/x-javascript" src="chrome://torbutton/content/torbutton.js" />

1 0

[torbutton/master] Update translations.
by mikeperry＠torproject.org 13 Nov '14

13 Nov '14

commit 952518c2f1ef29bbad191523ab9ae7a8204ba18f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Nov 12 19:44:54 2014 -0800 Update translations. --- src/chrome/locale/it/torbutton.dtd | 14 +++++++------- src/chrome/locale/pt/torbutton.dtd | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index c8a0669..11741a7 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Fai clic per inizializzare Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "Impostazioni di Privacy e Sicurezza"> <!ENTITY torbutton.prefs.block_thread "Blocca la lettura della cronologia durante l'uso di Tor (essenziale)"> <!ENTITY torbutton.prefs.block_thwrite "Blocca la scrittura della cronologia durante l'uso di Tor (consigliato)"> <!ENTITY torbutton.prefs.block_nthread "Blocca la lettura della cronologia quando non si usa Tor (facoltativo)"> @@ -149,9 +149,9 @@ <!ENTITY torbutton.prefs.restrict_thirdparty "Limita i cookie di terze parti e altri dati di tracciamento"> <!ENTITY torbutton.prefs.block_plugins "Disabilita i plugin del browser (come Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Cambia i dettagli che ti distinguono dagli altri utenti di Tor Browser"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_caption "Livello di Sicurezza"> +<!ENTITY torbutton.prefs.sec_low "Basso (default)"> +<!ENTITY torbutton.prefs.sec_med_low "Medio-Basso"> +<!ENTITY torbutton.prefs.sec_med_high "Medio-Alto"> +<!ENTITY torbutton.prefs.sec_high "Alto"> +<!ENTITY torbutton.prefs.sec_custom "Valori Customizzabili"> diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd index c7388a2..d2b83a9 100644 --- a/src/chrome/locale/pt/torbutton.dtd +++ b/src/chrome/locale/pt/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Clique para iniciar o Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "Privacidade e Definições de Segurança"> <!ENTITY torbutton.prefs.block_thread "Bloquear leitura do histórico durante a utilização do Tor (crucial)"> <!ENTITY torbutton.prefs.block_thwrite "Bloquear escrita no histórico durante a utilização do Tor (recomendado)"> <!ENTITY torbutton.prefs.block_nthread "Bloquear leitura do histórico durante a não utilização do Tor (opcional)"> @@ -149,9 +149,9 @@ <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Desabilitar plugins (como o Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_caption "Nível de Segurança"> +<!ENTITY torbutton.prefs.sec_low "Baixo (pré-definido)"> +<!ENTITY torbutton.prefs.sec_med_low "Médio-Baixo"> +<!ENTITY torbutton.prefs.sec_med_high "Médio-Alto"> +<!ENTITY torbutton.prefs.sec_high "Alto"> +<!ENTITY torbutton.prefs.sec_custom "Valores definidos">

1 0

[torbutton/master] Changelog and version bump for 1.8.1.0.
by mikeperry＠torproject.org 13 Nov '14

13 Nov '14

commit c711366237e8838e0c00974a5385d17551203c2b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Nov 12 19:42:49 2014 -0800 Changelog and version bump for 1.8.1.0. --- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 53bb7c7..4510b0c 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.8.1.0 + * Bug 13746: Properly link Torbutton UI to thirdparty pref. + * Bug 13742: Remove SafeCache code (in favor of C++ implementation) + 1.8.0.3 * misc: Translation imports for security slider diff --git a/src/install.rdf b/src/install.rdf index febbd6e..402b99c 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.8.0.3</em:version> + <em:version>1.8.1.0</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Bug 13746: Properly link Torbutton UI to thirdparty pref.
by mikeperry＠torproject.org 13 Nov '14

13 Nov '14

commit 25c576f13caa3d30c872876c1cab0eb3b4845af7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Nov 12 16:28:31 2014 -0800 Bug 13746: Properly link Torbutton UI to thirdparty pref. --- src/chrome/content/torbutton.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index cd5f2dc..841dca8 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2120,7 +2120,11 @@ function torbutton_update_thirdparty_prefs() { var mode = m_tb_prefs.getBoolPref("extensions.torbutton.restrict_thirdparty"); try { - m_tb_prefs.setBoolPref("privacy.thirdparty.isolate", mode); + if (mode) { + m_tb_prefs.setIntPref("privacy.thirdparty.isolate", 2); + } else { + m_tb_prefs.setIntPref("privacy.thirdparty.isolate", 0); + } } catch(e) {} if (mode) { @@ -2130,7 +2134,6 @@ function torbutton_update_thirdparty_prefs() { } pref("security.enable_tls_session_tickets", !mode); - pref("network.http.spdy.enabled", !mode); // Force prefs to be synced to disk var prefService = Components.classes["@mozilla.org/preferences-service;1"]

1 0

[tor-browser/tor-browser-31.2.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 13 Nov '14

13 Nov '14

commit 102676cb7ebc3bdbef21cce20516a50788c5e416 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Nov 12 16:19:56 2014 -0800 fixup! TB4: Tor Browser's Firefox preference overrides. Bug #13742: Always enforce third party isolation. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 83b79b2..b6930a4 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -93,6 +93,7 @@ pref("security.enable_tls_session_tickets", false); pref("network.http.spdy.enabled", false); // Stores state and may have keepalive issues (both fixable) pref("network.http.spdy.enabled.v2", false); // Seems redundant, but just in case pref("network.http.spdy.enabled.v3", false); // Seems redundant, but just in case +pref("privacy.thirdparty.isolate", 2); // Always enforce third party isolation // Proxy and proxy security pref("network.proxy.socks", "127.0.0.1");

1 0

[tor-browser/tor-browser-31.2.0esr-4.5-1] Bug 13742: Isolate cache to URL bar domain.
by mikeperry＠torproject.org 13 Nov '14

13 Nov '14

commit 8425b9a358211777543303d2194b378b2765f144 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Nov 12 16:16:40 2014 -0800 Bug 13742: Isolate cache to URL bar domain. --- netwerk/protocol/http/nsHttpChannel.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp index 41ef8bb..6e8fa0b 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp @@ -66,6 +66,7 @@ #include "nsPerformance.h" #include "CacheObserver.h" #include "mozilla/Telemetry.h" +#include "mozIThirdPartyUtil.h" namespace mozilla { namespace net { @@ -2558,6 +2559,19 @@ nsHttpChannel::OpenCacheEntry(bool usingSSL) nsRefPtr<LoadContextInfo> info = GetLoadContextInfo(this); nsCOMPtr<nsICacheStorage> cacheStorage; nsCOMPtr<nsIURI> openURI; + + /* Obtain optional third party isolation domain */ + nsAutoCString cacheDomain; + nsCOMPtr<nsIURI> firstPartyIsolationURI; + nsCOMPtr<mozIThirdPartyUtil> thirdPartySvc + = do_GetService(THIRDPARTYUTIL_CONTRACTID); + rv = thirdPartySvc->GetFirstPartyIsolationURI(this, nullptr, + getter_AddRefs(firstPartyIsolationURI)); + if (NS_SUCCEEDED(rv) && firstPartyIsolationURI) { + thirdPartySvc->GetFirstPartyHostForIsolation(firstPartyIsolationURI, + cacheDomain); + } + if (!mFallbackKey.IsEmpty() && mFallbackChannel) { // This is a fallback channel, open fallback URI instead rv = NS_NewURI(getter_AddRefs(openURI), mFallbackKey); @@ -2612,7 +2626,7 @@ nsHttpChannel::OpenCacheEntry(bool usingSSL) cacheEntryOpenFlags |= nsICacheStorage::OPEN_BYPASS_IF_BUSY; rv = cacheStorage->AsyncOpenURI( - openURI, mPostID ? nsPrintfCString("%d", mPostID) : EmptyCString(), + openURI, nsPrintfCString("%s@%d", cacheDomain.get(), mPostID), cacheEntryOpenFlags, this); NS_ENSURE_SUCCESS(rv, rv); @@ -2647,7 +2661,7 @@ bypassCacheEntryOpen: NS_ENSURE_SUCCESS(rv, rv); rv = cacheStorage->AsyncOpenURI( - mURI, EmptyCString(), nsICacheStorage::OPEN_TRUNCATE, this); + mURI, cacheDomain, nsICacheStorage::OPEN_TRUNCATE, this); NS_ENSURE_SUCCESS(rv, rv); waitFlags.Keep(WAIT_FOR_OFFLINE_CACHE_ENTRY);

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'boklm/migrate_arch_v2'
by mikeperry＠torproject.org 12 Nov '14

12 Nov '14

commit 086938488c4f0b43d7830d577ab3e50a206d680e Merge: 9495a91 20623d4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Nov 11 16:54:13 2014 -0800 Merge remote-tracking branch 'boklm/migrate_arch_v2' tools/update-responses/update_responses | 8 ++++++++ 1 file changed, 8 insertions(+)

1 0

[tor-browser-bundle/master] update_responses: add support for arch migration
by mikeperry＠torproject.org 12 Nov '14

12 Nov '14

commit 20623d486854403dacc08ae953cc20ebcfeb6802 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 6 23:07:16 2014 +0100 update_responses: add support for arch migration --- tools/update-responses/update_responses | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index a42e700..c788586 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -219,6 +219,14 @@ sub write_responses { get_version_files($config, $version); create_missing_incremental_mars($config, $version); my $files = $config->{versions}{$version}{files}; + my $migrate_archs = $config->{versions}{$version}{migrate_archs} // {}; + foreach my $old_os (keys %$migrate_archs) { + my $new_os = $migrate_archs->{$old_os}; + foreach my $lang (keys %{$files->{$new_os}}) { + $files->{$old_os}{$lang}{complete} = + $files->{$new_os}{$lang}{complete}; + } + } foreach my $os (keys %$files) { foreach my $lang (keys %{$files->{$os}}) { my $resp = get_response($config, $version, $os,

1 0

[tor-browser-bundle/master] New config for 4.5-alpha-1 updates.
by mikeperry＠torproject.org 12 Nov '14

12 Nov '14

commit 46e9b3191a03ce432c4e7b9a4af86b16102a7819 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Nov 11 16:58:27 2014 -0800 New config for 4.5-alpha-1 updates. --- tools/update-responses/config.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index ad1c512..557b197 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -4,20 +4,24 @@ build_targets: linux64: Linux_x86_64-gcc3 win32: WINNT_x86-gcc3 osx32: Darwin_x86-gcc3 + osx64: Darwin_x86_64-gcc3 channels: release: 4.0 - alpha: 4.0 + alpha: 4.5-alpha-1 versions: 4.0: platformVersion: 31.2.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en download_url: https://www.torproject.org/dist/torbrowser/4.0 - 4.0-alpha-3: - platformVersion: 24.8.1 + 4.5-alpha-1: + platformVersion: 31.2.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.0-alpha-3 + download_url: https://www.torproject.org/dist/torbrowser/4.5-alpha-1 incremental_from: - - 4.0-alpha-2 -# osx32: -# minSupportedOSVersion: 10.7 -# unsupported: 1 + - 4.0 + - 4.0.1 + migrate_archs: + osx32: osx64 + osx32: + minSupportedOSVersion: 10.8 + detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda…

1 0

[tor-browser-bundle/master] Update target release date.
by mikeperry＠torproject.org 10 Nov '14

10 Nov '14

commit 9495a912a89f4dd17fd04231da21d39cc928742d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Nov 10 12:02:37 2014 -0800 Update target release date. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 7588ca5..988b4cd 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 4.5-alpha-1 -- Nov 3 2014 +Tor Browser 4.5-alpha-1 -- Nov 13 2014 * All Platforms * Bug 3455: Patch Firefox SOCKS and proxy filters to allow user+pass isolation * Bug 11955: Backport HTTPS Certificate Pinning patches from Firefox 32

1 0

[tor-browser-bundle/master] Bump versions file and update changelog for a couple bugs.
by mikeperry＠torproject.org 10 Nov '14

10 Nov '14

commit 1bcde1184949799508b78777e98fe8098a200244 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Nov 10 12:01:08 2014 -0800 Bump versions file and update changelog for a couple bugs. --- Bundle-Data/Docs/ChangeLog.txt | 6 ++++-- gitian/versions.alpha | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index afce051..7588ca5 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,12 +2,14 @@ Tor Browser 4.5-alpha-1 -- Nov 3 2014 * All Platforms * Bug 3455: Patch Firefox SOCKS and proxy filters to allow user+pass isolation * Bug 11955: Backport HTTPS Certificate Pinning patches from Firefox 32 + * Bug 13684: Backport Mozilla bug #1066190 (pinning issue fixed in Firefox 33) * Bug 13019: Make JS engine use English locale if a pref is set by Torbutton * Bug 13301: Prevent extensions incompatibility error after upgrades * Bug 13460: Fix MSVC compilation issue - * Update Tor to 0.2.6.0-alpha + * Bug 13504: Remove stale bridges from default bridge set + * Update Tor to 0.2.6.1-alpha * Update NoScript to 2.6.9.3 - * Update Torbutton to 1.8.0.2 + * Update Torbutton to 1.8.0.3 * Bug 9387: Provide a "Security Slider" for vulnerability surface reduction * Bug 13019: Synchronize locale spoofing pref with our Firefox patch * Bug 3455: Use SOCKS user+pass to isolate all requests from the same url domain diff --git a/gitian/versions.alpha b/gitian/versions.alpha index aace7f6..1c4227f 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,10 +8,10 @@ FIREFOX_VERSION=31.2.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build4 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build5 TOR_TAG=tor-0.2.6.1-alpha TORLAUNCHER_TAG=0.2.7.0.1 -TORBUTTON_TAG=1.8.0.2 +TORBUTTON_TAG=1.8.0.3 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'isis/bug13504'
by mikeperry＠torproject.org 10 Nov '14

10 Nov '14

commit 49b0bd8fc63c6e5730b94da6d9b9ce1afe01bb46 Merge: f8c8947 d54502b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Nov 10 11:57:47 2014 -0800 Merge remote-tracking branch 'isis/bug13504' Bundle-Data/PTConfigs/bridge_prefs.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --cc Bundle-Data/PTConfigs/bridge_prefs.js index 7684fec,20ec235..f4a4f41 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@@ -26,14 -24,9 +24,13 @@@ pref("extensions.torlauncher.default_br pref("extensions.torlauncher.default_bridge.fte-ipv6.1", "fte [2001:49f0:d002:1::2]:80 B629B0B607C8AC9349B5646C24E9D242184F5B6E"); pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte [2001:49f0:d00a:1::c]:80 2BD466989944867075E872310EBAD65BC88C8AEF"); - pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI"); - pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T"); - pref("extensions.torlauncher.default_bridge.scramblesuit.3", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); + pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T"); + pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); +pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 178.209.52.110:443 67E72FF33D7D41BF11C569646A0A7B4B188340DF cert=Z+cv8z19Qb8RxWlkagp7SxiDQN++b7D2Tntowhf+j4D15/kLuj3EoSSGvuREGPc3h60Ofw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); + pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 url=https://az668014.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/master] Remove default obfs3 bridges #4 and #5, and scramblesuit bridge #1.
by mikeperry＠torproject.org 10 Nov '14

10 Nov '14

commit d54502befc3bffef55541e9db18e3428d548cde1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Oct 21 20:36:40 2014 +0000 Remove default obfs3 bridges #4 and #5, and scramblesuit bridge #1. These bridges were removed because: 1. They have never provided their bridge descriptors for metrics. See #13504: https://bugs.torproject.org/13504 2. They are either unreachable or unreliable. 2.a. The two obfs3 bridges are unreachable: Oct 21 20:25:53.000 [warn] Proxy Client: unable to connect to 209.141.36.236:45496 ("TTL expired") Oct 21 20:25:53.000 [warn] Proxy Client: unable to connect to 208.79.90.242:35658 ("TTL expired") 2.b. The scramblesuit bridge is rejecting connections: Oct 21 20:26:57.000 [warn] Proxy Client: unable to connect to 188.40.121.112:39707 ("Connection refused") * REMOVE default bridges obfs3.4, obfs3.5, and scramblesuit.1. * RENAME other bridges' preference names to keep the lists sequential. * FIXES part of #13504, sort of kind of. We still don't have historical metrics for these bridges for the period they were active. --- Bundle-Data/PTConfigs/bridge_prefs.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index d9c2049..20ec235 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -5,10 +5,8 @@ pref("extensions.torlauncher.default_bridge_recommended_type", "obfs3"); pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:80 A09D536DD1752D542E1FBB3C9CE4449D51298239"); pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); -pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2"); -pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F"); -pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED"); -pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A"); +pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED"); +pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A"); pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1"); pref("extensions.torlauncher.default_bridge.flashproxy.2", "flashproxy 0.0.1.0:2"); @@ -26,9 +24,8 @@ pref("extensions.torlauncher.default_bridge.fte.6", "fte 128.105.214.163:8080 A1 pref("extensions.torlauncher.default_bridge.fte-ipv6.1", "fte [2001:49f0:d002:1::2]:80 B629B0B607C8AC9349B5646C24E9D242184F5B6E"); pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte [2001:49f0:d00a:1::c]:80 2BD466989944867075E872310EBAD65BC88C8AEF"); -pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI"); -pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T"); -pref("extensions.torlauncher.default_bridge.scramblesuit.3", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); +pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T"); +pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[torbutton/master] Update translations for security slider.
by mikeperry＠torproject.org 10 Nov '14

10 Nov '14

commit d02efa6a28370cfaecf59dfabe7144e1e49238b0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Nov 10 11:52:43 2014 -0800 Update translations for security slider. --- src/CHANGELOG | 3 +++ src/chrome/locale/ar/torbutton.dtd | 9 ++++++++- src/chrome/locale/de/torbutton.dtd | 33 +++++++++++++++++++------------ src/chrome/locale/es/torbutton.dtd | 9 ++++++++- src/chrome/locale/eu/torbutton.dtd | 9 ++++++++- src/chrome/locale/fa/torbutton.dtd | 9 ++++++++- src/chrome/locale/fr/torbutton.dtd | 9 ++++++++- src/chrome/locale/it/torbutton.dtd | 9 ++++++++- src/chrome/locale/ja/torbutton.dtd | 9 ++++++++- src/chrome/locale/ko/torbutton.dtd | 9 ++++++++- src/chrome/locale/nl/torbutton.dtd | 9 ++++++++- src/chrome/locale/pl/torbutton.dtd | 9 ++++++++- src/chrome/locale/pt/torbutton.dtd | 9 ++++++++- src/chrome/locale/ru/torbutton.dtd | 9 ++++++++- src/chrome/locale/sv/torbutton.dtd | 9 ++++++++- src/chrome/locale/tr/aboutTor.dtd | 16 +++++++-------- src/chrome/locale/tr/browser.properties | 2 +- src/chrome/locale/tr/torbutton.dtd | 9 ++++++++- src/chrome/locale/vi/torbutton.dtd | 9 ++++++++- src/chrome/locale/zh-CN/torbutton.dtd | 9 ++++++++- src/install.rdf | 2 +- 21 files changed, 161 insertions(+), 39 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 75b8fc2..53bb7c7 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +1.8.0.3 + * misc: Translation imports for security slider + 1.8.0.2 * Bug 13666: Various fixes for circuit status display diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index be20a8d..e30348e 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "زر تور"> <!ENTITY torbutton.button.tooltip "انقر لبدء زر تور"> -<!ENTITY torbutton.prefs.sec_settings "إعدادات الأمان"> +<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> <!ENTITY torbutton.prefs.block_thread "امنع قراءة تاريخ التصفح أثناء عمل تور (حَرِج)"> <!ENTITY torbutton.prefs.block_thwrite "امنع كتابة تاريخ التصفح أثناء عمل تور (محبّذ)"> <!ENTITY torbutton.prefs.block_nthread "امنع قراءة تاريخ التصفح أثناء توقف تور (اختياري)"> @@ -144,7 +144,14 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "أزل المنصة واللغة من استفسارات محرك بحث غوغل"> <!ENTITY torbutton.prefs.transparentTor "شفافية توريفكيشن (تحتاج موجه تور أو ترانسبوكسي مخصص)"> +<!ENTITY torbutton.prefs.priv_caption "إعدادات الخصوصية"> <!ENTITY torbutton.prefs.block_disk "لا تسجل سجل التصفح أو بيانات المواقع الألكترونية (تفعيل التصفح الخصوصي)"> <!ENTITY torbutton.prefs.restrict_thirdparty "تقييد الـCookies الخاصة بالطرف الثالث و بيانات التتبع الأخري."> <!ENTITY torbutton.prefs.block_plugins "تعطيل إضافات المتصفح (مثل فلاش)"> <!ENTITY torbutton.prefs.resist_fingerprinting "تغيير التفاصيل التي تميزك عن المستخدمين الآخرين لمتصفح تور"> +<!ENTITY torbutton.prefs.sec_caption "Security Level"> +<!ENTITY torbutton.prefs.sec_low "Low (default)"> +<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> +<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> +<!ENTITY torbutton.prefs.sec_high "High"> +<!ENTITY torbutton.prefs.sec_custom "Custom Values"> diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index b024b95..e0199c4 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -13,10 +13,10 @@ <!ENTITY torbutton.about.title "Über Torbutton"> <!ENTITY torbutton.about.version "Version:"> <!ENTITY torbutton.about.summary "Schützt die Privatsphäre Ihres Tor-Navigierens."> -<!ENTITY torbutton.about.code "Code Beitragende:"> +<!ENTITY torbutton.about.code "Code-Beitragende:"> <!ENTITY torbutton.about.maintainer "Hauptbetreuer:"> <!ENTITY torbutton.about.security_review "Sicherheitsüberprüfung:"> -<!ENTITY torbutton.about.donate "Wenn Sie Tor gerne benutzen, könne Sie vielleicht etwas"> +<!ENTITY torbutton.about.donate "Wenn Sie Tor gerne benutzen, können Sie vielleicht etwas"> <!ENTITY torbutton.about.make_donation "spenden."> <!ENTITY torbutton.pref_connection.notice "Torbutton deaktivieren, um diese Einstellungen zu ändern."> <!ENTITY torbutton.pref_connection.more_info "Mehr Informationen"> @@ -32,7 +32,7 @@ <!ENTITY torbutton.context_menu.about.key "Ü"> <!ENTITY torbutton.context_menu.networksettings "Netzwerkeinstellungen öffnen …"> <!ENTITY torbutton.context_menu.networksettings.key "N"> -<!ENTITY torbutton.context_menu.downloadUpdate "Aktualisierung des Tor-Browser-Paket herunterladen …"> +<!ENTITY torbutton.context_menu.downloadUpdate "Aktualisierung des Tor-Browser-Pakets herunterladen …"> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie-Schutzvorkehrungen"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> @@ -44,14 +44,14 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "F"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Klicken, um Torbutton zu aktivieren"> -<!ENTITY torbutton.prefs.sec_settings "Sicherheitseinstellungen"> +<!ENTITY torbutton.prefs.privacy_security_settings "Privatsphäre- und Sicherheits-Einstellungen"> <!ENTITY torbutton.prefs.block_thread "Lesen von Einträgen, der besuchten Seiten (Verlauf), während der Benutzung von Tor verhindern (wichtig)"> <!ENTITY torbutton.prefs.block_thwrite "Schreiben von Einträgen, der besuchten Seiten (Verlauf), während der Benutzung von Tor verhindern (empfohlen)"> <!ENTITY torbutton.prefs.block_nthread "Lesen von Einträgen, der besuchten Seiten (Verlauf), außerhalb der Benutzung von Tor verhindern (optional)"> <!ENTITY torbutton.prefs.block_nthwrite "Schreiben von Einträgen, der besuchten Seiten (Verlauf), außerhalb der Benutzung von Tor verhindern (optional)"> <!ENTITY torbutton.prefs.clear_history "Informationen zu besuchten Seiten (Verlauf), bei An- und Abschalten von Tor, löschen (optional)"> <!ENTITY torbutton.prefs.clear_cache "Zugriff auf den Festplattenzwischenspeicher verhindern und Zwischenspeicherinformationen bei An- und Abschalten von Tor löschen"> -<!ENTITY torbutton.prefs.block_cache "Den Zugriff auf Festplatten- und Speicherzwischenspeicher verhindern, während Tor aktiviert ist"> +<!ENTITY torbutton.prefs.block_cache "Den Zugriff auf Festplatten- und Zwischenspeicher verhindern, während Tor aktiviert ist"> <!ENTITY torbutton.prefs.cookie_jars "Cookies, die nicht zu Tor gehören, in einer gesicherten jar-Datei speichern"> <!ENTITY torbutton.prefs.cookie_protection "Den Cookie-Schutzdialog benutzen, um auszuwählen"> <!ENTITY torbutton.prefs.mmm_cookies "Ich verwalte meine Cookies manuell (gefährlich)"> @@ -71,12 +71,12 @@ <!ENTITY torbutton.prefs.all_shutdown "Cookies beim Beenden des Browsers löschen (immer)"> <!ENTITY torbutton.prefs.no_shutdown "Cookies beim Beenden des Browsers nicht löschen"> <!ENTITY torbutton.prefs.disable_sessionstore "Speichern des Browserzustandes zwischen Programmaufrufen deaktivieren (empfohlen)"> -<!ENTITY torbutton.prefs.headers "Überschriften"> +<!ENTITY torbutton.prefs.headers "Headers"> <!ENTITY torbutton.prefs.spoof_english "Englischen Browser (US) vortäuschen"> <!ENTITY torbutton.prefs.refererspoofing "Absender tarnen"> <!ENTITY torbutton.prefs.spoofblank "Einen leeren Absender vortäuschen, während Tor benutzt wird (kann einige Seiten ruinieren)"> <!ENTITY torbutton.prefs.smartspoof "Intelligente Absendertarnung während der Benutzung von Tor (Vortäuschung verschiedener Domainabsender)"> -<!ENTITY torbutton.prefs.nospoof "Keine vortäuschen des Absenders, während Tor benutzt wird (sendet Absender normal)"> +<!ENTITY torbutton.prefs.nospoof "Kein Vortäuschen des Absenders, während Tor benutzt wird (sendet Absender normal)"> <!ENTITY torbutton.prefs.disable_domstorage "Die DOM-Speicherung während der Benutzung von Tor deaktivieren (wichtig)"> <!ENTITY torbutton.prefs.forms "Formulare"> <!ENTITY torbutton.prefs.block_tforms "Speichern von Passwörtern und Formularen, während der Benutzung von Tor, deaktivieren (empfohlen)"> @@ -90,14 +90,14 @@ <!ENTITY torbutton.prefs.clear_http_auth "Legitimierte HTTP-Sitzungen löschen (empfohlen)"> <!ENTITY torbutton.prefs.block_js_history "Den Zugriff zur Verlaufsnavigation isolieren (wichtig)"> <!ENTITY torbutton.prefs.resize_on_toggle "Die Größe des Fensters zu einem Vielfachen von 50px, während der Benutzung von Tor, veränderen (empfohlen)"> -<!ENTITY torbutton.prefs.close_tor "Slle Tor-Fenster und Reiter beim Wechsel schließen (optional)"> +<!ENTITY torbutton.prefs.close_tor "Alle Tor-Fenster und Reiter beim Wechsel schließen (optional)"> <!ENTITY torbutton.prefs.close_nontor "Alle Nicht-Tor-Fenster und Reiter beim Wechsel schließen (optional)"> -<!ENTITY torbutton.prefs.block_links "Klicks auf Verweise sperren und das Neuladen von Seiten von verschiedenen Tor-Modi (optional)"> +<!ENTITY torbutton.prefs.block_links "Klicks auf Verweise und das Neuladen von Seiten von verschiedenen Tor-Modi sperren (optional)"> <!ENTITY torbutton.prefs.jar_certs "SSL-Zertifikate in verschiedenen Dateien für Tor/Nicht-Tor speichern (empfohlen)"> <!ENTITY torbutton.prefs.jar_ca_certs "CA-Zertifikate in verschiedenen Dateien für Tor/Nicht-Tor speichern (empfohlen)"> -<!ENTITY torbutton.prefs.locked_mode "Den Knopf und Tastenkürzel deaktiviere, um versehentliches Umschalten zu vermeiden."> +<!ENTITY torbutton.prefs.locked_mode "Den Knopf und Tastenkürzel deaktivieren, um versehentliches Umschalten zu vermeiden."> <!ENTITY torbutton.prefs.startup_state "Tor-Modus bei normalen Start einstellen auf:"> -<!ENTITY torbutton.prefs.shutdown_state "Modus beim letzten Beenden"> +<!ENTITY torbutton.prefs.shutdown_state "Modus beim Beenden"> <!ENTITY torbutton.prefs.startup "Inbetriebnahme"> <!ENTITY torbutton.prefs.block_tor_file_net "Den Zugriff zum Netzwerk von Adressen mit »file://« sperren (empfohlen)"> <!ENTITY torbutton.prefs.block_nontor_file_net "Den Zugriff, bei deaktiviertem Tor, zum Netzwerk von Adressen mit »file://« sperren"> @@ -116,7 +116,7 @@ <!ENTITY torbutton.prefs.no_proxy_warning "Achtung: Vermeiden Sie es, oben irgendwelche Rechnernamen zu verwenden"> <!ENTITY torbutton.prefs.spoofreresh "Tarnung aufrischen"> <!ENTITY torbutton.prefs.refereroptions "Einstellungen der Absendertarnung"> -<!ENTITY torbutton.prefs.nospoof "Keine vortäuschen des Absenders, während Tor benutzt wird (sendet Absender normal)"> +<!ENTITY torbutton.prefs.nospoof "Kein Vortäuschen des Absenders, während Tor benutzt wird (sendet Absender normal)"> <!ENTITY torbutton.prefs.spoofroot "Den enthaltenen Ordner auf der Seite tarnen"> <!ENTITY torbutton.prefs.spoofdomain "Die Domain als Absender vortäuschen"> <!ENTITY torbutton.prefs.spoofblank "Einen leeren Absender vortäuschen, während Tor benutzt wird (kann einige Seiten ruinieren)"> @@ -128,7 +128,7 @@ <!ENTITY torbutton.cookiedialog.protectCookie "Cookie schützen"> <!ENTITY torbutton.cookiedialog.removeCookie "Cookie entfernen"> <!ENTITY torbutton.cookiedialog.unprotectCookie "Cookie nicht schützen"> -<!ENTITY torbutton.cookiedialog.removeAllBut "Alle, außer den geschützten entfernen"> +<!ENTITY torbutton.cookiedialog.removeAllBut "Alle, außer die geschützten Cookies entfernen"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Neue Cookies schützen"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Neue Cookies nicht schützen"> <!ENTITY torbutton.prefs.disable_livemarks "Aktualisierungen der Livemarks während der Benutzung von Tor deaktivieren"> @@ -144,7 +144,14 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Betriebssystem und Sprache bei Google Suchabfragen nicht übermitteln"> <!ENTITY torbutton.prefs.transparentTor "Transparente-Torification (Erfordert eigenen Transproxy oder Tor-Router)"> +<!ENTITY torbutton.prefs.priv_caption "Privatsphären-Einstellungen"> <!ENTITY torbutton.prefs.block_disk "Browser-Verlauf und Internetdaten nicht speichern (aktiviert den privaten Browser-Modus)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Profildateien (Cookies) von Drittanbietern und andere Überwachungsdaten einschränken"> <!ENTITY torbutton.prefs.block_plugins "Browser-Erweiterungen deaktivieren (wie z.B. Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Details ändern, die Sie von anderen Tor-Browser-Benutzern unterscheiden"> +<!ENTITY torbutton.prefs.sec_caption "Sicherheitslevel"> +<!ENTITY torbutton.prefs.sec_low "gering (Standard)"> +<!ENTITY torbutton.prefs.sec_med_low "unteres Mittel"> +<!ENTITY torbutton.prefs.sec_med_high "oberes Mittel"> +<!ENTITY torbutton.prefs.sec_high "hoch"> +<!ENTITY torbutton.prefs.sec_custom "Eigene Werte"> diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd index 1dcdda7..c51f7f9 100644 --- a/src/chrome/locale/es/torbutton.dtd +++ b/src/chrome/locale/es/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "v"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Haga clic para inicializar Torbutton"> -<!ENTITY torbutton.prefs.sec_settings "Preferencias de seguridad"> +<!ENTITY torbutton.prefs.privacy_security_settings "Preferencias de Privacidad y Seguridad"> <!ENTITY torbutton.prefs.block_thread "Bloquear lecturas del historial al usar Tor (crucial)"> <!ENTITY torbutton.prefs.block_thwrite "Bloquear escrituras al historial al usar Tor (recomendado)"> <!ENTITY torbutton.prefs.block_nthread "Bloquear lecturas del historial al no usar Tor (opcional)"> @@ -144,7 +144,14 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Despojar de información de su plataforma e idioma a las consultas en los cuadros de búsqueda de Google"> <!ENTITY torbutton.prefs.transparentTor "Torificación transparente (requiere un transproxy personalizado o un router Tor)"> +<!ENTITY torbutton.prefs.priv_caption "Parámetros de privacidad"> <!ENTITY torbutton.prefs.block_disk "No registrar historial de navegación o datos del sitio web (habilita Modo de Navegación Privada)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir cookies de terceros y otros datos de seguimiento"> <!ENTITY torbutton.prefs.block_plugins "Desactivar complementos del navegador (como Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Cambiar los detalles que le distinguen de otros usuarios de Navegador Tor"> +<!ENTITY torbutton.prefs.sec_caption "Nivel de Seguridad"> +<!ENTITY torbutton.prefs.sec_low "Bajo (por defecto)"> +<!ENTITY torbutton.prefs.sec_med_low "Medio-Bajo"> +<!ENTITY torbutton.prefs.sec_med_high "Medio-Alto"> +<!ENTITY torbutton.prefs.sec_high "Alto"> +<!ENTITY torbutton.prefs.sec_custom "Valores Personalizados"> diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd index 4e03b31..3c6d032 100644 --- a/src/chrome/locale/eu/torbutton.dtd +++ b/src/chrome/locale/eu/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Sakatu Torbutton abiarazteko"> -<!ENTITY torbutton.prefs.sec_settings "Segurtasun Ezarpenak"> +<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> <!ENTITY torbutton.prefs.block_thread "Blokeatu historia irakurketak Tor bitartean (erabakigarria)"> <!ENTITY torbutton.prefs.block_thwrite "Blokeatu historia idazketak Tor bitartean (gomendatua)"> <!ENTITY torbutton.prefs.block_nthread "Blokeatu historia irakurketak Ez-Tor bitartean (hautazkoa)"> @@ -144,7 +144,14 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Kendu plataforma eta hizkuntza Google Searh Box eskaeretatik"> <!ENTITY torbutton.prefs.transparentTor "Torifikazio Gardena (transproxy pertsonalizatua edo Tor routerra behar du)"> +<!ENTITY torbutton.prefs.priv_caption "Pribatutasun ezarpenak"> <!ENTITY torbutton.prefs.block_disk "Ez grabatu nabigatze historia edo webgune datuak (Nabigatze pribatu modua gaitzen du)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Hirugarrenen cookie-ak eta beste jarraipen datuak murriztu"> <!ENTITY torbutton.prefs.block_plugins "Nabigatzaile pluginak ezgaitu (Flash bezala)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Zu beste Tor Browser erabiltzaileengandik nabarmentzen zaituzten xehetasunak aldatu"> +<!ENTITY torbutton.prefs.sec_caption "Security Level"> +<!ENTITY torbutton.prefs.sec_low "Low (default)"> +<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> +<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> +<!ENTITY torbutton.prefs.sec_high "High"> +<!ENTITY torbutton.prefs.sec_custom "Custom Values"> diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd index d0514a0..07c0bc7 100644 --- a/src/chrome/locale/fa/torbutton.dtd +++ b/src/chrome/locale/fa/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "دکمه تُر"> <!ENTITY torbutton.button.tooltip "جهت شروع دكمه تُرکليک کنيد"> -<!ENTITY torbutton.prefs.sec_settings "تنظیمات امنیتی"> +<!ENTITY torbutton.prefs.privacy_security_settings "حفظ حریم خصوصی و تنظیمات امنیتی"> <!ENTITY torbutton.prefs.block_thread "جلوگیری ازخواندن تاریخچه (History) در هنگام اجرای تُر (بسیار مهم)"> <!ENTITY torbutton.prefs.block_thwrite "جلوگیری از نوشتن تاریخچه (History) در هنگام اجرای تُر (توصیه شده)"> <!ENTITY torbutton.prefs.block_nthread "جلوگیری از خواندن تاریخچه (History) در زمان غيرتُر (اختیاری)"> @@ -144,7 +144,14 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "اطلاعات مربوط به نوع سيستم عامل و مرورگر و زبان مورد استفاده شما را از ورودی‌های جستجوگر گوگل حذف کن"> <!ENTITY torbutton.prefs.transparentTor "سازگارسازی با تُر به صورت شفاف (نياز به رهياب تُر يا Tor router و يا transproxy سفارشی دارد)"> +<!ENTITY torbutton.prefs.priv_caption "تنظیمات حریم خصوصی"> <!ENTITY torbutton.prefs.block_disk "ثبت‌نكردن تاريخچه يا داده‌هاى وب‌گاه (گشت و گذار ‌خصوصى فعال مى‌كند)"> <!ENTITY torbutton.prefs.restrict_thirdparty "محدود‌كردن كوكى‌هاى طرف سوم و داده‌هاى پيگردى ديگر"> <!ENTITY torbutton.prefs.block_plugins "غيرفعال‌كردن افزايه‌هاى مرورگر (مثل فلش)"> <!ENTITY torbutton.prefs.resist_fingerprinting "تغييردادن جزئياتى كه شمارا از كاربران ديگر تُر تميزمى‌كند"> +<!ENTITY torbutton.prefs.sec_caption "سطح امنیت"> +<!ENTITY torbutton.prefs.sec_low "پایین (به طور پیش فرض)"> +<!ENTITY torbutton.prefs.sec_med_low "متوسط - کم"> +<!ENTITY torbutton.prefs.sec_med_high "متوسط - بالا"> +<!ENTITY torbutton.prefs.sec_high "زیاد"> +<!ENTITY torbutton.prefs.sec_custom "تنظیم سفارشی"> diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index a537fba..f72e094 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Cliquez pour lancer Torbutton"> -<!ENTITY torbutton.prefs.sec_settings "Paramètres de sécurité"> +<!ENTITY torbutton.prefs.privacy_security_settings "Paramètres de confidentialité et de sécurité"> <!ENTITY torbutton.prefs.block_thread "Bloquer la lecture de l'historique pendant l'utilisation de Tor (indispensable)"> <!ENTITY torbutton.prefs.block_thwrite "Bloquer l'écriture à historique pendant l'utilisation de Tor (recommandé)"> <!ENTITY torbutton.prefs.block_nthread "Bloquer la lecture de l'historique en mode non-Tor (facultatif)"> @@ -144,7 +144,14 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Supprimer les informations relatives à la plateforme et à la langue des requêtes Google"> <!ENTITY torbutton.prefs.transparentTor "Torification transparente (requiert un transproxy personnalisé ou un routeur Tor)"> +<!ENTITY torbutton.prefs.priv_caption "Paramètres de vie privé"> <!ENTITY torbutton.prefs.block_disk "Ne pas sauvegarder l'historique de navigation et les données des sites webs (active le Mode de Navigation Privée)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les cookies tiers ainsi que les autres données de traçage"> <!ENTITY torbutton.prefs.block_plugins "Désactiver les greffons du navigateur (tels que Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les détails qui vous distingue des autres utilisateurs du Navigateur Tor"> +<!ENTITY torbutton.prefs.sec_caption "Niveau de sécurité"> +<!ENTITY torbutton.prefs.sec_low "Faible (défaut)"> +<!ENTITY torbutton.prefs.sec_med_low "Moyen-Bas"> +<!ENTITY torbutton.prefs.sec_med_high "Moyen-Haut"> +<!ENTITY torbutton.prefs.sec_high "Haut"> +<!ENTITY torbutton.prefs.sec_custom "Valeurs personnalisées"> diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index a512ba7..c8a0669 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Fai clic per inizializzare Torbutton"> -<!ENTITY torbutton.prefs.sec_settings "Impostazioni di sicurezza"> +<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> <!ENTITY torbutton.prefs.block_thread "Blocca la lettura della cronologia durante l'uso di Tor (essenziale)"> <!ENTITY torbutton.prefs.block_thwrite "Blocca la scrittura della cronologia durante l'uso di Tor (consigliato)"> <!ENTITY torbutton.prefs.block_nthread "Blocca la lettura della cronologia quando non si usa Tor (facoltativo)"> @@ -144,7 +144,14 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Estrai sistema e idioma dalle interrogazioni di Google Search Box"> <!ENTITY torbutton.prefs.transparentTor "Torificazione trasparente (richiede un transproxy personalizzato o un tor router)"> +<!ENTITY torbutton.prefs.priv_caption "Impostazioni Privacy"> <!ENTITY torbutton.prefs.block_disk "Non registrare la cronologia di navigazione o i dati dei siti (attiva la Navigazione Anonima)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Limita i cookie di terze parti e altri dati di tracciamento"> <!ENTITY torbutton.prefs.block_plugins "Disabilita i plugin del browser (come Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Cambia i dettagli che ti distinguono dagli altri utenti di Tor Browser"> +<!ENTITY torbutton.prefs.sec_caption "Security Level"> +<!ENTITY torbutton.prefs.sec_low "Low (default)"> +<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> +<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> +<!ENTITY torbutton.prefs.sec_high "High"> +<!ENTITY torbutton.prefs.sec_custom "Custom Values"> diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index 37dc8a8..4add4d2 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Torbuttomを初期状態に戻す"> -<!ENTITY torbutton.prefs.sec_settings "セキュリティ設定"> +<!ENTITY torbutton.prefs.privacy_security_settings "プライバシーとセキュリティーの設定"> <!ENTITY torbutton.prefs.block_thread "ブロック履歴がTor中に読みます (重要)"> <!ENTITY torbutton.prefs.block_thwrite "ブロック履歴がTor中に書き込まれます (推奨)"> <!ENTITY torbutton.prefs.block_nthread "非Tor中にブロック履歴を読みます (任意)"> @@ -144,7 +144,14 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Google検索ボックスのクエリからプラットフォームと言語を外す"> <!ENTITY torbutton.prefs.transparentTor "透過型Tor化 (カスタム透過型プロキシかTorのルーターが必要)"> +<!ENTITY torbutton.prefs.priv_caption "プライバシー設定"> <!ENTITY torbutton.prefs.block_disk "ブラウジング履歴やウェブサイトのデータを記録しない (プライベートブラウジングモードを有効化)"> <!ENTITY torbutton.prefs.restrict_thirdparty "サードパーティーのCookieやその他のトラッキングデータを制限"> <!ENTITY torbutton.prefs.block_plugins "ブラウザのプラグイン(フラッシュなど)を無効化"> <!ENTITY torbutton.prefs.resist_fingerprinting "あなたとほかのTorブラウザのユーザーを区別する詳細を変更"> +<!ENTITY torbutton.prefs.sec_caption "セキュリティレベル"> +<!ENTITY torbutton.prefs.sec_low "低い(デフォルト)"> +<!ENTITY torbutton.prefs.sec_med_low "中の低"> +<!ENTITY torbutton.prefs.sec_med_high "中の上"> +<!ENTITY torbutton.prefs.sec_high "高い"> +<!ENTITY torbutton.prefs.sec_custom "カスタム値"> diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index c936759..0b96309 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Torbutton 설정 초기화"> -<!ENTITY torbutton.prefs.sec_settings "보안 설정"> +<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> <!ENTITY torbutton.prefs.block_thread "Tor 사용 시, 사용 기록을 외부에서 읽어가는 것을 차단 (중요)"> <!ENTITY torbutton.prefs.block_thwrite "Tor 사용 시, 사용 기록을 남기지 않기 (추천)"> <!ENTITY torbutton.prefs.block_nthread "Tor를 사용하지 않을 때, 사용 기록을 외부에서 읽어가는 것을 차단 (선택)"> @@ -144,7 +144,14 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "구글 검색 쿼리시 플랫폼과 언어 정보를 벗겨냄"> <!ENTITY torbutton.prefs.transparentTor "투명 Toritication (사용자 transproxy나 Tor 라우터 필요)"> +<!ENTITY torbutton.prefs.priv_caption "개인 정보 설정"> <!ENTITY torbutton.prefs.block_disk "브라우징 히스토리나 웹사이트 데이터를 기록하지 마십시오 (Private Browsing 모드 활성화)"> <!ENTITY torbutton.prefs.restrict_thirdparty "제 3자 쿠키와 다른 추적 데이터 제한"> <!ENTITY torbutton.prefs.block_plugins "브라우저 플러그인 비활성화 (예 : 플래시)"> <!ENTITY torbutton.prefs.resist_fingerprinting "다른 Tor browser 사용자로부터 구별되는 세부 사항 변경"> +<!ENTITY torbutton.prefs.sec_caption "Security Level"> +<!ENTITY torbutton.prefs.sec_low "Low (default)"> +<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> +<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> +<!ENTITY torbutton.prefs.sec_high "High"> +<!ENTITY torbutton.prefs.sec_custom "Custom Values"> diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index 9be6230..c963be5 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Klik hier om Torbutton te initialiseren"> -<!ENTITY torbutton.prefs.sec_settings "Beveiligingsinstellingen"> +<!ENTITY torbutton.prefs.privacy_security_settings "Privacy en Beveiligingsinstellingen"> <!ENTITY torbutton.prefs.block_thread "Blokkeer het lezen van de geschiedenis met Tor (cruciaal)"> <!ENTITY torbutton.prefs.block_thwrite "Blokkeer het schrijven van de geschiedenis met Tor (aangeraden)"> <!ENTITY torbutton.prefs.block_nthread "Blokkeer het lezen van de geschiedenis zonder Tor (optioneel)"> @@ -144,7 +144,14 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Systeem- en taalgegevens verwijderen bij gebruik van de Google zoekbalk"> <!ENTITY torbutton.prefs.transparentTor "Transparante Torificatie (Heeft aangepaste transparente proxy of Tor router nodig)"> +<!ENTITY torbutton.prefs.priv_caption "Privacy configuratie"> <!ENTITY torbutton.prefs.block_disk "Bewaar geen surfgeschiedenis of website-data (Schakelt private browsing modus in)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Beperk cookies en andere tracking-gegevens van derden"> <!ENTITY torbutton.prefs.block_plugins "Schakel browser plugins uit (zoals Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Verander details die je onderscheiden van andere Tor Browser gebruikers"> +<!ENTITY torbutton.prefs.sec_caption "Beveiligingsniveau"> +<!ENTITY torbutton.prefs.sec_low "Laag (standaard)"> +<!ENTITY torbutton.prefs.sec_med_low "Medium-Laag"> +<!ENTITY torbutton.prefs.sec_med_high "Medium-Hoog"> +<!ENTITY torbutton.prefs.sec_high "Hoog"> +<!ENTITY torbutton.prefs.sec_custom "Aangepaste waarden"> diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd index b7ca9d2..5cfb5ef 100644 --- a/src/chrome/locale/pl/torbutton.dtd +++ b/src/chrome/locale/pl/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Kliknij tutaj, aby uruchomić Torbutton"> -<!ENTITY torbutton.prefs.sec_settings "Ustawienia bezpieczeństwa"> +<!ENTITY torbutton.prefs.privacy_security_settings "Ustawienia prywatności i bezpieczeństwa"> <!ENTITY torbutton.prefs.block_thread "Blokuj odczyt historii gdy Tor jest włączony (krytyczne)"> <!ENTITY torbutton.prefs.block_thwrite "Blokuj zapis do historii gdy Tor jest włączony (zalecane)"> <!ENTITY torbutton.prefs.block_nthread "Blokuj odczyt historii gdy Tor jest wyłączony (opcjonalnie)"> @@ -144,7 +144,14 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Usuń nazwę systemu i język z zapytań Google"> <!ENTITY torbutton.prefs.transparentTor "Przezroczysta toryfikacja (wymaga własnego transproxy lub routera Tora)"> +<!ENTITY torbutton.prefs.priv_caption "Ustawienia Prywatności"> <!ENTITY torbutton.prefs.block_disk "Nie zapisuj historii przeglądania i danych o stronach (włącza Tryb Prywatny)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Ograniczaj ciasteczka firm trzecich i inne dane służące do śledzenia"> <!ENTITY torbutton.prefs.block_plugins "Wyłącz wtyczki przeglądarki (takie jak Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Zmień szczegóły odróżniające Cię od innych użytkowników Przeglądarki Tora"> +<!ENTITY torbutton.prefs.sec_caption "Poziom bezpieczeństwa"> +<!ENTITY torbutton.prefs.sec_low "Niski (domyślny)"> +<!ENTITY torbutton.prefs.sec_med_low "Średni-Niski"> +<!ENTITY torbutton.prefs.sec_med_high "Średni-Wysoki"> +<!ENTITY torbutton.prefs.sec_high "Wysoki"> +<!ENTITY torbutton.prefs.sec_custom "Wartości niestandardowe"> diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd index a030ec7..c7388a2 100644 --- a/src/chrome/locale/pt/torbutton.dtd +++ b/src/chrome/locale/pt/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Clique para iniciar o Torbutton"> -<!ENTITY torbutton.prefs.sec_settings "Configurações de Segurança"> +<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> <!ENTITY torbutton.prefs.block_thread "Bloquear leitura do histórico durante a utilização do Tor (crucial)"> <!ENTITY torbutton.prefs.block_thwrite "Bloquear escrita no histórico durante a utilização do Tor (recomendado)"> <!ENTITY torbutton.prefs.block_nthread "Bloquear leitura do histórico durante a não utilização do Tor (opcional)"> @@ -144,7 +144,14 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Retirar plataforma e língua dos pedidos da caixa de pesquisa do Google"> <!ENTITY torbutton.prefs.transparentTor "Torificação transparente (Necessita transpoxy customizado ou router Tor)"> +<!ENTITY torbutton.prefs.priv_caption "Configurações de Privacidade"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Desabilitar plugins (como o Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> +<!ENTITY torbutton.prefs.sec_caption "Security Level"> +<!ENTITY torbutton.prefs.sec_low "Low (default)"> +<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> +<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> +<!ENTITY torbutton.prefs.sec_high "High"> +<!ENTITY torbutton.prefs.sec_custom "Custom Values"> diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index 41ab358..3bc9df2 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Инициализировать Torbutton"> -<!ENTITY torbutton.prefs.sec_settings "Настройки безопасности"> +<!ENTITY torbutton.prefs.privacy_security_settings "Настройки Конфиденциальности и Безопасности"> <!ENTITY torbutton.prefs.block_thread "Блокировать чтение из журнала в режиме Tor (важно)"> <!ENTITY torbutton.prefs.block_thwrite "Блокировать запись в журнал в режиме Tor (желательно)"> <!ENTITY torbutton.prefs.block_nthread "Блокировать чтение из журнала в режиме не-Tor (необяз.)"> @@ -144,7 +144,14 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Удалять сведения о платформе и языке из запросов строки поиска Google"> <!ENTITY torbutton.prefs.transparentTor "Прозрачная торификация (Требует пользовательских transproxy или Tor-маршрутизатора)"> +<!ENTITY torbutton.prefs.priv_caption "Настройки приватности"> <!ENTITY torbutton.prefs.block_disk "Не сохранять журнал обозревателя и данные с посещаемых сайтов (активирует функцию приватного просмотра)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Блокировать сторонние куки и другие данные слежения"> <!ENTITY torbutton.prefs.block_plugins "Отключить расширения браузера (такие как Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Изменить сведения, отличающие вас от других пользователей Tor Browser"> +<!ENTITY torbutton.prefs.sec_caption "Уровень Безопасности"> +<!ENTITY torbutton.prefs.sec_low "Низкий (по умолчанию)"> +<!ENTITY torbutton.prefs.sec_med_low "Средне-Низкий"> +<!ENTITY torbutton.prefs.sec_med_high "Средне-Высокий"> +<!ENTITY torbutton.prefs.sec_high "Высокий"> +<!ENTITY torbutton.prefs.sec_custom "Собственные Значения"> diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index 67aafe8..645b61d 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Klicka för att installera Torbutton"> -<!ENTITY torbutton.prefs.sec_settings "Säkerhetsinställningar"> +<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> <!ENTITY torbutton.prefs.block_thread "Blockera läsning av historik medan Tor är aktiverat (kritiskt)"> <!ENTITY torbutton.prefs.block_thwrite "Blockera lagring av historik medan Tor är aktiverat (rekommenderat)"> <!ENTITY torbutton.prefs.block_nthread "Blockera läsning av historik medan Tor är inaktiverat (valfritt)"> @@ -144,7 +144,14 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Ta bort plattform och språk från Google Sök Box förfrågningar"> <!ENTITY torbutton.prefs.transparentTor "Transparent torifikation (Kräver skräddarsydd transproxy eller Tor router)"> +<!ENTITY torbutton.prefs.priv_caption "Sekretessinställningar"> <!ENTITY torbutton.prefs.block_disk "Spara ingen historik eller webbplatsdata (aktiverar privat surfning)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Begränsa tredjepartskakor och annan tracking data"> <!ENTITY torbutton.prefs.block_plugins "Inaktivera insticksmoduler (så som Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Ändra detailjer som utmärker dig ifrån andra Tor Browser användare"> +<!ENTITY torbutton.prefs.sec_caption "Security Level"> +<!ENTITY torbutton.prefs.sec_low "Low (default)"> +<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> +<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> +<!ENTITY torbutton.prefs.sec_high "High"> +<!ENTITY torbutton.prefs.sec_custom "Custom Values"> diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd index 5e6e3e5..bdcd023 100644 --- a/src/chrome/locale/tr/aboutTor.dtd +++ b/src/chrome/locale/tr/aboutTor.dtd @@ -8,14 +8,14 @@ <!ENTITY aboutTor.outOfDateTorOn.label "AMA, bu tarayıcı güncel değil."> <!ENTITY aboutTor.outOfDateTorOff.label "AYRICA, bu tarayıcı güncel değil."> -<!ENTITY aboutTor.outOfDate2.label "Soğana tıklayın ve Tor Tarayıcı Paketi Güncellemesini İndir seçin."> +<!ENTITY aboutTor.outOfDate2.label "Soğana tıklayın ve Tor Tarayıcı Paketi Güncellemesini İndir'i seçin."> -<!ENTITY aboutTor.check.label "Tor Ağ ayarlarını test edin"> +<!ENTITY aboutTor.check.label "Tor Ağ Ayarlarını Test Edin"> <!ENTITY aboutTor.success.label "Tebrikler!"> <!ENTITY aboutTor.success2.label "Bu tarayıcı Tor kullanımı için yapılandırılmıştır."> <!ENTITY aboutTor.success3.label "Artık İnternet'i anonim olarak kullanmakta özgürsünüz!"> -<!ENTITY aboutTor.failure.label "Üzgünüz, bir şeyler yanlış gitti!"> +<!ENTITY aboutTor.failure.label "Bir Şeyler Yanlış Gitti!"> <!ENTITY aboutTor.failure2.label "Bu tarayıcıda Tor çalışmıyor."> <!ENTITY aboutTor.failure3prefix.label "Yardım için %S ile bağlantıya geçin."> <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> @@ -28,19 +28,19 @@ <!ENTITY aboutTor.torInfo1.label "Ek bilgi:"> <!ENTITY aboutTor.torInfo2.label "Ülke ve IP Adresi:"> -<!ENTITY aboutTor.torInfo3.label "Çıkış düğümü:"> +<!ENTITY aboutTor.torInfo3.label "Çıkış Düğümü:"> <!ENTITY aboutTor.torInfo4.label "Bu sunucu ziyaretçiler ile ilgili herhangi bir bilgi toplamaz."> -<!ENTITY aboutTor.whatnextQuestion.label "Sırada ne var?"> +<!ENTITY aboutTor.whatnextQuestion.label "Sıradaki Ne?"> <!ENTITY aboutTor.whatnextAnswer.label "Tor, anonim kalmanız için tüm ihtiyacınız olan şey değildir! Kimliğinizin güvende kalması için bazı İnternet alışkanlıklarınızı değiştirmeniz gerekebilir."> <!ENTITY aboutTor.whatnext.label "Anonim kalmak için püf noktalar »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "Yardım edebilirsiniz!"> +<!ENTITY aboutTor.helpInfo1.label "Yardım Edebilirsiniz!"> <!ENTITY aboutTor.helpInfo2.label "Tor ağını daha hızlı ve daha güçlü yapmamız konusunda yardım edebilmeniz için bir çok yol var:"> <!ENTITY aboutTor.helpInfo3.label "Bir Tor Ayna Düğümü Çalıştır »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Servislerinizi gönüllü yapın »"> +<!ENTITY aboutTor.helpInfo4.label "Servislerinizi Gönüllü Yapın »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Bağış yapın »"> +<!ENTITY aboutTor.helpInfo5.label "Bağış Yapın »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> <!ENTITY aboutTor.footer.label "Tor Projesi çevrimiçi gizlilik ve mahremiyet araştırma, geliştirme ve eğitime adanmış bir ABD 501(c)(3) kar amacı gütmeyen bir kuruluştur."> diff --git a/src/chrome/locale/tr/browser.properties b/src/chrome/locale/tr/browser.properties index 295a03a..d788077 100644 --- a/src/chrome/locale/tr/browser.properties +++ b/src/chrome/locale/tr/browser.properties @@ -2,7 +2,7 @@ browser.startup.homepage=about:tor # Spell checker dictionary -spellchecker.dictionary=en_US +spellchecker.dictionary=tr_TR # Default search engine browser.search.defaultenginename=Startpage diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index f2f1762..d911237 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbuton"> <!ENTITY torbutton.button.tooltip "Başlat"> -<!ENTITY torbutton.prefs.sec_settings "Güvenlik Ayarları"> +<!ENTITY torbutton.prefs.privacy_security_settings "Gizlilik ve Güvenlik Ayarları"> <!ENTITY torbutton.prefs.block_thread "Tor çalışırken geçmişi okumayı durdur(kritik)"> <!ENTITY torbutton.prefs.block_thwrite "Tor çalışırken geçmişi oluşturmayı durdur(önerilen)"> <!ENTITY torbutton.prefs.block_nthread "Tor çalışmıyorken geçmişi okumayı durdur (opsiyonel)"> @@ -144,7 +144,14 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Kaldır platform ve Google Arama Kutusu gelen dil sorgular"> <!ENTITY torbutton.prefs.transparentTor "Şeffaf Torifikasyon (özel transproxy veya Tor yönlendiricisi gerekir)"> +<!ENTITY torbutton.prefs.priv_caption "Gizlilik Ayarları"> <!ENTITY torbutton.prefs.block_disk "Tarama geçmişini ve web sitesi bilgilerini kaydetme (Özel Tarama Kipi'ni etkinleştirir)"> <!ENTITY torbutton.prefs.restrict_thirdparty "3. parti çerezleri ve diğer iz sürücü bilgileri engelle"> <!ENTITY torbutton.prefs.block_plugins "Tarayıcı eklentilerini engelle (Flash benzeri)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Diğer Tor kullanıcılardan sizi ayıran detayları değiştir"> +<!ENTITY torbutton.prefs.sec_caption "Güvenlik Seviyesi"> +<!ENTITY torbutton.prefs.sec_low "Düşük (varsayılan)"> +<!ENTITY torbutton.prefs.sec_med_low "Orta-Düşük"> +<!ENTITY torbutton.prefs.sec_med_high "Orta-Yüksek"> +<!ENTITY torbutton.prefs.sec_high "Yüksek"> +<!ENTITY torbutton.prefs.sec_custom "Özel Değerler"> diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd index 13a3351..f33340d 100644 --- a/src/chrome/locale/vi/torbutton.dtd +++ b/src/chrome/locale/vi/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Nhấp để nhận diện Torbutton"> -<!ENTITY torbutton.prefs.sec_settings "Thiết lập Bảo mật"> +<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> <!ENTITY torbutton.prefs.block_thread "Chặn việc đọc lịch sử h.đ trong quá trình dùng Tor (cấp thiết)"> <!ENTITY torbutton.prefs.block_thwrite "Chặn việc ghi lịch sử h.đ trong quá trình dùng Tor (khuyến cáo)"> <!ENTITY torbutton.prefs.block_nthread "Chặn việc đọc lịch sử trong quá trình không dùng Tor (tùy chọn)"> @@ -144,7 +144,14 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries"> <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> +<!ENTITY torbutton.prefs.priv_caption "Privacy Settings"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> +<!ENTITY torbutton.prefs.sec_caption "Security Level"> +<!ENTITY torbutton.prefs.sec_low "Low (default)"> +<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> +<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> +<!ENTITY torbutton.prefs.sec_high "High"> +<!ENTITY torbutton.prefs.sec_custom "Custom Values"> diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 06ab662..f0f31b5 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "点此初始化 Torbutton"> -<!ENTITY torbutton.prefs.sec_settings "安全设置"> +<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> <!ENTITY torbutton.prefs.block_thread "使用 Tor 时禁止读取历史记录（重要）"> <!ENTITY torbutton.prefs.block_thwrite "使用 Tor 时禁止写入历史记录（推荐）"> <!ENTITY torbutton.prefs.block_nthread "使用 Tor 之外的代理时禁止读取历史记录（可选）"> @@ -144,7 +144,14 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "在 Google 搜索栏搜索时分割平台和语言信息。"> <!ENTITY torbutton.prefs.transparentTor "Tor 强化透明代理（需要自设 TransProxy 或 Tor 路由）"> +<!ENTITY torbutton.prefs.priv_caption "隐私设置"> <!ENTITY torbutton.prefs.block_disk "禁止记录浏览历史或网站数据（启用隐私浏览模式）"> <!ENTITY torbutton.prefs.restrict_thirdparty "限制第三方 cookie 和其他数据跟踪程序"> <!ENTITY torbutton.prefs.block_plugins "禁用浏览器插件（比如 Flash）"> <!ENTITY torbutton.prefs.resist_fingerprinting "请修改区别你与其他 Tor 浏览器用户的详细信息"> +<!ENTITY torbutton.prefs.sec_caption "Security Level"> +<!ENTITY torbutton.prefs.sec_low "Low (default)"> +<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> +<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> +<!ENTITY torbutton.prefs.sec_high "High"> +<!ENTITY torbutton.prefs.sec_custom "Custom Values"> diff --git a/src/install.rdf b/src/install.rdf index 40820f5..febbd6e 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.8.0.2</em:version> + <em:version>1.8.0.3</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser/tor-browser-31.2.0esr-4.5-1] squash! Bug #11955 Backport certificate pinning
by mikeperry＠torproject.org 07 Nov '14

07 Nov '14

commit 2822ccdb6d00b563413a285fe63488ab2ca7b460 Author: Camilo Viecco <cviecco(a)mozilla.com> Date: Thu Nov 6 10:30:37 2014 -0800 squash! Bug #11955 Backport certificate pinning Bug #13684: Backport Mozilla's Bug 1066190 --- security/certverifier/CertVerifier.cpp | 48 ++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/security/certverifier/CertVerifier.cpp b/security/certverifier/CertVerifier.cpp index b2db9fc..1af728e 100644 --- a/security/certverifier/CertVerifier.cpp +++ b/security/certverifier/CertVerifier.cpp @@ -197,6 +197,36 @@ SECStatus chainValidationCallback(void* state, const CERTCertList* certList, return SECSuccess; } +// This always returns secfailure but its objective is to replate +// the PR_Error +static void +tryWorsenPRErrorInCallback(CERTCertificate* cert, + ChainValidationCallbackState* callbackState) { + ScopedCERTCertificate certCopy(CERT_DupCertificate(cert)); + if (!certCopy) { + return; + } + ScopedCERTCertList certList(CERT_NewCertList()); + if (!certList) { + return; + } + SECStatus srv = CERT_AddCertToListTail(certList.get(), certCopy.get()); + if (srv != SECSuccess) { + return; + } + certCopy.release(); // now owned by certList + PRBool chainOK = false; + srv = chainValidationCallback(&callbackState, certList.get(), &chainOK); + if (srv != SECSuccess) { + return; + } + if (!chainOK) { + PR_SetError(SEC_ERROR_APPLICATION_CALLBACK_ERROR, 0); // same as libpkix + return ; + } + return; // no change in PR_error +} + static SECStatus ClassicVerifyCert(CERTCertificate* cert, const SECCertificateUsage usage, @@ -276,6 +306,12 @@ ClassicVerifyCert(CERTCertificate* cert, return SECFailure; } } + + // If there is an error we may need to worsen to error to be a pinning failure + if (rv != SECSuccess && usage == certificateUsageSSLServer) { + tryWorsenPRErrorInCallback(cert, callbackState); + } + if (rv == SECSuccess && validationChain) { *validationChain = certChain.release(); } @@ -545,6 +581,12 @@ CertVerifier::MozillaPKIXVerifyCert( return SECFailure; } + // If there is an error we may need to worsen to error to be a pinning failure + if (rv != SECSuccess && usage == certificateUsageSSLServer && + PR_GetError() != SEC_ERROR_APPLICATION_CALLBACK_ERROR) { + tryWorsenPRErrorInCallback(cert, callbackState); + } + if (validationChain && rv == SECSuccess) { *validationChain = builtChain.release(); } @@ -876,6 +918,12 @@ CertVerifier::VerifyCert(CERTCertificate* cert, rv = CERT_PKIXVerifyCert(cert, usage, cvin, cvout, pinArg); pkix_done: + // If there is an error we may need to worsen to error to be a pinning failure + if (rv != SECSuccess && usage == certificateUsageSSLServer && + PR_GetError() != SEC_ERROR_APPLICATION_CALLBACK_ERROR) { + tryWorsenPRErrorInCallback(cert, &callbackState); + } + if (validationChain) { PR_LOG(gCertVerifierLog, PR_LOG_DEBUG, ("VerifyCert: validation chain requested\n")); ScopedCERTCertificate trustAnchor(cvout[validationTrustAnchorLocation].value.pointer.cert);

1 0

[gitian-builder/tor-browser-builder-3] Use virtio for disk in KVM instead of emulating real hardware
by gk＠torproject.org 07 Nov '14

07 Nov '14

commit b8d7fb5bc3fecab6998f17cfb842fb303fc0ea92 Author: Lunar <lunar(a)torproject.org> Date: Mon Oct 13 00:26:58 2014 +0200 Use virtio for disk in KVM instead of emulating real hardware This should improve I/O performance. --- libexec/start-target | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/start-target b/libexec/start-target index 95376cc..467ed63 100755 --- a/libexec/start-target +++ b/libexec/start-target @@ -22,7 +22,7 @@ case $VMSW in [ -n "$KVM" ] || KVM=qemu-system-x86_64 ;; esac - $KVM -enable-kvm -m ${VMEM:-2000} -smp ${NPROCS:-2} -drive file=target-$SUFFIX.qcow2,cache=writeback -net nic,model=virtio -net user,hostfwd=tcp:127.0.0.1:$VM_SSH_PORT-:22 -vnc 127.0.0.1:16 > var/target.log 2>&1 & + $KVM -enable-kvm -m ${VMEM:-2000} -smp ${NPROCS:-2} -drive file=target-$SUFFIX.qcow2,cache=writeback,if=virtio -net nic,model=virtio -net user,hostfwd=tcp:127.0.0.1:$VM_SSH_PORT-:22 -vnc 127.0.0.1:16 > var/target.log 2>&1 & echo $! > var/target.pid wait rm var/target.pid

1 0

[gitian-builder/tor-browser-builder-3] Copy target image as a sparse file in LXC mode
by gk＠torproject.org 07 Nov '14

07 Nov '14

commit ef50217b3aaaf268fcfe907e85c884fe3932474b Author: Lunar <lunar(a)torproject.org> Date: Mon Oct 13 00:26:22 2014 +0200 Copy target image as a sparse file in LXC mode This will save us from writing a lot of zeros on disk. --- libexec/make-clean-vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/make-clean-vm b/libexec/make-clean-vm index 9915df3..b02b0d2 100755 --- a/libexec/make-clean-vm +++ b/libexec/make-clean-vm @@ -59,7 +59,7 @@ case $VMSW in qemu-img create -f qcow2 -o backing_file="$BASE.qcow2" "$OUT.qcow2" ;; LXC) - cp -a $BASE $OUT + cp -a --sparse=always $BASE $OUT on-target -u root /root/firstboot.sh ;; VBOX)

1 0

[tor-browser/tor-browser-31.2.0esr-4.5-1] Bug 13558: Allow download folder change on Win XP.
by mikeperry＠torproject.org 07 Nov '14

07 Nov '14

commit 6f12ba342e64dddd3b27b6f358b17dfd7345c1bd Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 5 13:32:03 2014 +0000 Bug 13558: Allow download folder change on Win XP. Changing the download folder on Win XP was crashing due to a mingw-w64 related Firefox bug. This is the backport of the fix provided in https://bugzilla.mozilla.org/show_bug.cgi?id=1091594. Thanks to Jacek Caban for the help. --- mfbt/Char16.h | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/mfbt/Char16.h b/mfbt/Char16.h index 7bcd008..3f03653 100644 --- a/mfbt/Char16.h +++ b/mfbt/Char16.h @@ -95,6 +95,24 @@ class char16ptr_t explicit operator wchar_t*() const { return const_cast<wchar_t*>(static_cast<const wchar_t*>(*this)); } + explicit operator int() const { + return reinterpret_cast<intptr_t>(ptr); + } + explicit operator unsigned int() const { + return reinterpret_cast<uintptr_t>(ptr); + } + explicit operator long() const { + return reinterpret_cast<intptr_t>(ptr); + } + explicit operator unsigned long() const { + return reinterpret_cast<uintptr_t>(ptr); + } + explicit operator long long() const { + return reinterpret_cast<intptr_t>(ptr); + } + explicit operator unsigned long long() const { + return reinterpret_cast<uintptr_t>(ptr); + } /** * Some Windows API calls accept BYTE* but require that data actually be WCHAR*. @@ -130,8 +148,23 @@ class char16ptr_t bool operator!=(decltype(nullptr)) const { return ptr != nullptr; } - char16ptr_t operator+(size_t add) const { - return char16ptr_t(ptr + add); + char16ptr_t operator+(int aValue) const { + return char16ptr_t(ptr + aValue); + } + char16ptr_t operator+(unsigned int aValue) const { + return char16ptr_t(ptr + aValue); + } + char16ptr_t operator+(long aValue) const { + return char16ptr_t(ptr + aValue); + } + char16ptr_t operator+(unsigned long aValue) const { + return char16ptr_t(ptr + aValue); + } + char16ptr_t operator+(long long aValue) const { + return char16ptr_t(ptr + aValue); + } + char16ptr_t operator+(unsigned long long aValue) const { + return char16ptr_t(ptr + aValue); } ptrdiff_t operator-(const char16ptr_t &other) const { return ptr - other.ptr;

1 0

[tor-browser/tor-browser-31.2.0esr-4.5-1] Merge remote-tracking branch 'gk/bug_13558' into tor-browser-31.2.0esr-4.5-1
by mikeperry＠torproject.org 07 Nov '14

07 Nov '14

commit 2e442bddd4c3dc1701d630acd0abdb979433cbe9 Merge: d67c094 6f12ba3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Nov 6 23:37:55 2014 -0800 Merge remote-tracking branch 'gk/bug_13558' into tor-browser-31.2.0esr-4.5-1 mfbt/Char16.h | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-)

1 0

[tor-browser-bundle/master] Update versions+changelog for 13594 and 13666.
by mikeperry＠torproject.org 05 Nov '14

05 Nov '14

commit f8c894726f58bbcde03bb204228d8fa8976c4b5b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Nov 4 18:42:48 2014 -0800 Update versions+changelog for 13594 and 13666. --- Bundle-Data/Docs/ChangeLog.txt | 4 +++- gitian/versions.alpha | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index cac86a7..afce051 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -7,17 +7,19 @@ Tor Browser 4.5-alpha-1 -- Nov 3 2014 * Bug 13460: Fix MSVC compilation issue * Update Tor to 0.2.6.0-alpha * Update NoScript to 2.6.9.3 - * Update Torbutton to 1.8.0.1 + * Update Torbutton to 1.8.0.2 * Bug 9387: Provide a "Security Slider" for vulnerability surface reduction * Bug 13019: Synchronize locale spoofing pref with our Firefox patch * Bug 3455: Use SOCKS user+pass to isolate all requests from the same url domain * Bug 8641: Create browser UI to indicate current tab's Tor circuit IPs * Bug 13651: Prevent circuit-status related UI hang. + * Bug 13666: Various circuit status UI fixes * Bug 13586: Make meek use TLS session tickets (to look like stock Firefox). * Include obfs4proxy pluggable transport * Windows * Bug 13443: Re-enable DirectShow; fix crash with mingw patch. * Bug 13091: Make app name "Tor Browser" instead of "Tor" + * Bug 13594: Fix update failure for Windows XP users * Mac * Bug 10138: Switch to 64bit builds for MacOS diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 284c4ef..aace7f6 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,10 +8,10 @@ FIREFOX_VERSION=31.2.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build3 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build4 TOR_TAG=tor-0.2.6.1-alpha TORLAUNCHER_TAG=0.2.7.0.1 -TORBUTTON_TAG=1.8.0.1 +TORBUTTON_TAG=1.8.0.2 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8

1 0

[tor-browser/tor-browser-31.2.0esr-4.5-1] Bug 13594: Windows updater depends on msvcr100.dll
by mikeperry＠torproject.org 05 Nov '14

05 Nov '14

commit a9ccc52a47abcb55a1b39ca7aeb066dfcc861549 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Nov 4 10:53:58 2014 -0500 Bug 13594: Windows updater depends on msvcr100.dll On Windows, updater.exe failed to start if a copy of msvcr100.dll was not installed in the system directory. We now append to the PATH the directory that contains our copy of msvcr100.dll; that is, the Browser/ directory that contains firefox.exe. That same directory contains a copy of libssp-0.dll, which updater.exe also depends on; both DLL dependencies are now satisfied from the Browser/ directory. Previously, the libssp-0.dll dependency was being satisifed from the .../Browser/TorBrowser/Tor directory which Tor Launcher adds to the path (and typically the updater is run from within a browser session or after a restart during which the PATH is preserved). --- toolkit/xre/nsUpdateDriver.cpp | 46 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp index f398aed..1188736 100644 --- a/toolkit/xre/nsUpdateDriver.cpp +++ b/toolkit/xre/nsUpdateDriver.cpp @@ -39,6 +39,7 @@ # include <windows.h> # include <shlwapi.h> # include "nsWindowsHelpers.h" +# include "prprf.h" # define getcwd(path, size) _getcwd(path, size) # define getpid() GetCurrentProcessId() #elif defined(XP_UNIX) @@ -133,6 +134,36 @@ GetCurrentWorkingDir(char *buf, size_t size) } +#if defined(XP_WIN) +#define PATH_SEPARATOR ";" + +// In Tor Browser, updater.exe depends on some DLLs that are located in the +// app directory. To allow the updater to run when it has been copied into +// the update directory, we append the app directory to the PATH. +static nsresult +AdjustPathForUpdater(nsIFile *appDir) +{ + nsAutoCString appPath; + nsresult rv = appDir->GetNativePath(appPath); + NS_ENSURE_SUCCESS(rv, rv); + + char *s = nullptr; + char *pathValue = PR_GetEnv("PATH"); + if ((nullptr == pathValue) || ('\0' == *pathValue)) { + s = PR_smprintf("PATH=%s", appPath.get()); + } else { + s = PR_smprintf("PATH=%s" PATH_SEPARATOR "%s", pathValue, appPath.get()); + } + + // We intentionally leak the value that is passed into PR_SetEnv() because + // the environment will hold a pointer to it. + if ((nullptr == s) || (PR_SUCCESS != PR_SetEnv(s))) + return NS_ERROR_FAILURE; + + return NS_OK; +} +#endif + #ifdef DEBUG static void dump_argv(const char *aPrefix, char **argv, int argc) @@ -592,6 +623,13 @@ SwitchToUpdatedApp(nsIFile *greDir, nsIFile *updateDir, nsIFile *statusFile, PR_SetEnv("MOZ_SAFE_MODE_RESTART=1"); } +#if defined(XP_WIN) + nsresult rv2 = AdjustPathForUpdater(appDir); + if (NS_FAILED(rv2)) { + LOG(("SwitchToUpdatedApp -- AdjustPathForUpdater failed (0x%x)\n", rv2)); + } +#endif + LOG(("spawning updater process for replacing [%s]\n", updaterPath.get())); #if defined(USE_EXECV) @@ -881,6 +919,14 @@ ApplyUpdate(nsIFile *greDir, nsIFile *updateDir, nsIFile *statusFile, if (isOSUpdate) { PR_SetEnv("MOZ_OS_UPDATE=1"); } + +#if defined(XP_WIN) + nsresult rv2 = AdjustPathForUpdater(appDir); + if (NS_FAILED(rv2)) { + LOG(("ApplyUpdate -- AdjustPathForUpdater failed (0x%x)\n", rv2)); + } +#endif + #if defined(MOZ_WIDGET_GONK) // We want the updater to be CPU friendly and not subject to being killed by // the low memory killer, so we pass in some preferences to allow it to

1 0

[tor-browser/tor-browser-31.2.0esr-4.5-1] Merge remote-tracking branch 'brade/bug13594-01' into tor-browser-31.2.0esr-4.5-1
by mikeperry＠torproject.org 05 Nov '14

05 Nov '14

commit d67c094300a4adaf8b930d52646597e34b5dfac4 Merge: be0ac86 a9ccc52 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Nov 4 18:39:51 2014 -0800 Merge remote-tracking branch 'brade/bug13594-01' into tor-browser-31.2.0esr-4.5-1 toolkit/xre/nsUpdateDriver.cpp | 46 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)

1 0