- tbb-commits - lists.torproject.org

[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

[torbutton/master] get node data when a circuit's first stream is built
by mikeperry＠torproject.org 05 Nov '14

05 Nov '14

commit 60fde4eaa8c097f68143356736d08bc1c82cc4f4 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Nov 4 15:07:18 2014 -0800 get node data when a circuit's first stream is built --- src/chrome/content/tor-circuit-display.js | 53 +++++++++++++++++++++-------- src/modules/tor-control-port.js | 2 +- 2 files changed, 39 insertions(+), 16 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index c8d255e..49cd832 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -53,6 +53,8 @@ let localizedCountryNameFromCode = function (countryCode) { // A mutable map that stores the current nodes for each domain. let domainToNodeDataMap = {}; +let knownCircuitIDs = {}; + // __trimQuotes(s)__. // Removes quotation marks around a quoted string. let trimQuotes = s => s ? s.match(/^\"(.*)\"$/)[1] : undefined; @@ -133,22 +135,43 @@ let updateCircuitDisplay = function () { } }; -// __collectBuiltCircuitData(aController)__. -// Watches for CIRC BUILT events and records their data in the domainToNodeDataMap. -let collectBuiltCircuitData = function (aController) { +// __getCircuitStatusByID(aController, circuitID, onCircuitStatus)__ +// Returns the circuit status for the circuit with the given ID +// via onCircuitStatus(status). +let getCircuitStatusByID = function(aController, circuitID, onCircuitStatus) { + aController.getInfo("circuit-status", function (circuitStatuses) { + for (let circuitStatus of circuitStatuses) { + if (circuitStatus.id === circuitID) { + onCircuitStatus(circuitStatus); + } + } + }); +}; + +// __collectIsolationData(aController)__. +// Watches for STREAM SENTCONNECT events. When a SENTCONNECT event occurs, then +// the isolation settings (SOCKS username+password) become fixed for the +// corresponding circuit. Whenever the first stream on a new circuit is seen, +// looks up u+p and records the node data in the domainToNodeDataMap. +let collectIsolationData = function (aController) { aController.watchEvent( - "CIRC", - circuitEvent => circuitEvent.status === "EXTENDED" || - circuitEvent.status === "BUILT", - function (circuitEvent) { - let domain = trimQuotes(circuitEvent.SOCKS_USERNAME); - if (domain) { - nodeDataForCircuit(aController, circuitEvent, function (nodeData) { - domainToNodeDataMap[domain] = nodeData; - updateCircuitDisplay(); + "STREAM", + streamEvent => streamEvent.StreamStatus === "SENTCONNECT", + function (streamEvent) { + if (!knownCircuitIDs[streamEvent.CircuitID]) { + logger.eclog(4, "streamEvent.CircuitID: " + streamEvent.CircuitID); + knownCircuitIDs[streamEvent.CircuitID] = true; + getCircuitStatusByID(aController, streamEvent.CircuitID, function (circuitStatus) { + let domain = trimQuotes(circuitStatus.SOCKS_USERNAME); + if (domain) { + nodeDataForCircuit(aController, circuitStatus, function (nodeData) { + domainToNodeDataMap[domain] = nodeData; + updateCircuitDisplay(); + }); + } else { + updateCircuitDisplay(); + } }); - } else { - updateCircuitDisplay(); } }); }; @@ -181,7 +204,7 @@ let syncDisplayWithSelectedTab = function () { let display = function (host, port, password) { let myController = controller(host, port || 9151, password, function (x) { logger.eclog(5, x); }); syncDisplayWithSelectedTab(); - collectBuiltCircuitData(myController); + collectIsolationData(myController); }; return display; diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index c461aa6..ada80b5 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -259,7 +259,7 @@ io.controlSocket = function (host, port, password, onError) { // Log in to control port. sendCommand("authenticate " + (password || "")); // Activate needed events. - sendCommand("setevents circ"); + sendCommand("setevents stream"); return { close : socket.close, sendCommand : sendCommand, addNotificationCallback : notificationDispatcher.addCallback, removeNotificationCallback : notificationDispatcher.removeCallback };

1 0

[torbutton/master] Update changelog and version for 1.8.0.2
by mikeperry＠torproject.org 05 Nov '14

05 Nov '14

commit 0c5795bf21f6a036488473f52c1baee7d07d25e6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Nov 4 18:37:03 2014 -0800 Update changelog and version for 1.8.0.2 --- src/CHANGELOG | 3 +++ src/install.rdf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 98d3251..75b8fc2 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +1.8.0.2 + * Bug 13666: Various fixes for circuit status display + 1.8.0.1 * Bug 13651: Fix hangs associated with circuit status UI from #8641. diff --git a/src/install.rdf b/src/install.rdf index ae50323..40820f5 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.1</em:version> + <em:version>1.8.0.2</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] Various minor fixes for tor-control-port.js and tor-circuit-display.js
by mikeperry＠torproject.org 05 Nov '14

05 Nov '14

commit 5aca83a36d00b3624500ae2e07d559a915d333f1 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Nov 4 11:17:45 2014 -0800 Various minor fixes for tor-control-port.js and tor-circuit-display.js --- src/chrome/content/tor-circuit-display.js | 51 ++++++++++++++++------------- src/modules/tor-control-port.js | 4 +-- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 3a1fed8..c8d255e 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -55,7 +55,7 @@ let domainToNodeDataMap = {}; // __trimQuotes(s)__. // Removes quotation marks around a quoted string. -let trimQuotes = s => s.match(/^\"(.*)\"$/)[1]; +let trimQuotes = s => s ? s.match(/^\"(.*)\"$/)[1] : undefined; // nodeDataForID(controller, id, onResult)__. // Requests the IP, country code, and name of a node with given ID. @@ -94,7 +94,7 @@ let nodeLines = function (nodeData) { for (let {ip, country} of nodeData) { result.push(localizedCountryNameFromCode(country) + " (" + ip + ")"); } - result.push("Internet"); + result[4] = ("Internet"); return result; }; @@ -102,30 +102,35 @@ let nodeLines = function (nodeData) { // Updates the Tor circuit display SVG, showing the current domain // and the relay nodes for that domain. let updateCircuitDisplay = function () { - let URI = gBrowser.selectedBrowser.currentURI, - domain = null, - nodeData = null; - // Try to get a domain for this URI. Otherwise it remains null. - try { - domain = URI.host; - } catch (e) { } - if (domain) { - // Check if we have anything to show for this domain. - nodeData = domainToNodeDataMap[domain]; - if (nodeData) { - // Update the displayed domain. - document.querySelector("svg#tor-circuit text#domain").innerHTML = "(" + domain + "):"; - // Update the displayed information for the relay nodes. - let diagramNodes = document.querySelectorAll("svg#tor-circuit text.node-text"), - lines = nodeLines(nodeData); - for (let i = 0; i < diagramNodes.length; ++i) { - diagramNodes[i].innerHTML = lines[i]; + let selectedBrowser = gBrowser.selectedBrowser; + if (selectedBrowser) { + let URI = selectedBrowser.currentURI, + domain = null, + nodeData = null; + // Try to get a domain for this URI. Otherwise it remains null. + try { + domain = URI.host; + } catch (e) { } + if (domain) { + // Check if we have anything to show for this domain. + nodeData = domainToNodeDataMap[domain]; + if (nodeData) { + // Update the displayed domain. + document.querySelector("svg#tor-circuit text#domain").innerHTML = "(" + domain + "):"; + // Update the displayed information for the relay nodes. + let diagramNodes = document.querySelectorAll("svg#tor-circuit text.node-text"), + //diagramCircles = document.querySelectorAll("svg#tor-circuit .node-circule"), + lines = nodeLines(nodeData); + for (let i = 0; i < diagramNodes.length; ++i) { + let line = lines[i]; + diagramNodes[i].innerHTML = line ? line : ""; + } } } + // Only show the Tor circuit if we have a domain and node data. + document.querySelector("svg#tor-circuit").style.display = (domain && nodeData) ? + 'block' : 'none'; } - // Only show the Tor circuit if we have a domain and node data. - document.querySelector("svg#tor-circuit").style.display = (domain && nodeData) ? - 'block' : 'none'; }; // __collectBuiltCircuitData(aController)__. diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index 855b34b..c461aa6 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -107,7 +107,7 @@ io.asyncSocket = function (host, port, onInputData, onError) { let totalString = pendingWrites.join(""); try { outputStream.write(totalString, totalString.length); - log("wrote: " + aString + "\n"); + log("controlPort << " + aString + "\n"); } catch (err) { onError(err); } @@ -164,7 +164,7 @@ io.onLineFromOnMessage = function (onMessage) { pendingLines = []; // Pass multiline message to onMessage. onMessage(message); - //log(message); + log("controlPort >> " + message); } }; };

1 0

[tor-browser-bundle/maint-4.0] Use the new security.ssl.disable_session_identifiers pref.
by gk＠torproject.org 04 Nov '14

04 Nov '14

commit 110ff7e7077c9311c33cdacb472a45fbbf490559 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 26 19:06:17 2014 +0000 Use the new security.ssl.disable_session_identifiers pref. This is to reenable the TLS session tickets that are disabled by Tor Browser, so the TLS client hello matches that of stock Firefox. https://trac.torproject.org/projects/tor/ticket/13442#comment:1 https://trac.torproject.org/projects/tor/ticket/11183#comment:9 The previously used pref security.enable_tls_session_tickets has been removed and replaced by security.ssl.disable_session_identifiers. https://bugzilla.mozilla.org/show_bug.cgi?id=917049 https://bugzilla.mozilla.org/show_bug.cgi?id=967977 https://trac.torproject.org/projects/tor/ticket/10822 https://gitweb.torproject.org/tor-browser.git/commitdiff/5524ae43780e473831… --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index cddc237..eb94d1d 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -6,8 +6,8 @@ user_pref("browser.dom.window.dump.enabled", true); // Enable TLS session tickets (disabled by default in Tor Browser). Otherwise // there is a missing TLS extension. -// https://trac.torproject.org/projects/tor/ticket/11183#comment:9 -user_pref("security.enable_tls_session_tickets", true); +// https://trac.torproject.org/projects/tor/ticket/13442#comment:1 +user_pref("security.ssl.disable_session_identifiers", false); // Disable safe mode. In case of a crash, we don't want to prompt for a // safe-mode browser that has extensions disabled and no proxy.

1 0

[tor-browser-bundle/master] Update version and changelog for Torbutton 1.8.0.1
by mikeperry＠torproject.org 04 Nov '14

04 Nov '14

commit d4351a02e34c07b21c0efa029496e515a5482df8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Nov 3 20:18:22 2014 -0800 Update version and changelog for Torbutton 1.8.0.1 --- Bundle-Data/Docs/ChangeLog.txt | 3 ++- gitian/versions.alpha | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 376a38b..cac86a7 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -7,11 +7,12 @@ 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.0 + * Update Torbutton to 1.8.0.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 * Bug 8641: Create browser UI to indicate current tab's Tor circuit IPs + * Bug 13651: Prevent circuit-status related UI hang. * 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 b84f92e..284c4ef 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-build3 TOR_TAG=tor-0.2.6.1-alpha TORLAUNCHER_TAG=0.2.7.0.1 -TORBUTTON_TAG=1.8.0.0 +TORBUTTON_TAG=1.8.0.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

[torbutton/master] Bump changelog and version for 1.8.0.1
by mikeperry＠torproject.org 04 Nov '14

04 Nov '14

commit c688cf25b3b8ec5752a6afccdffe2ededb6a1c66 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Nov 3 19:32:49 2014 -0800 Bump changelog and version for 1.8.0.1 --- src/CHANGELOG | 3 +++ src/install.rdf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 0ad0e44..98d3251 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +1.8.0.1 + * Bug 13651: Fix hangs associated with circuit status UI from #8641. + 1.8.0.0 * Bug 9387: Provide a "Security Slider" for vulnerability surface reduction * Bug 13019: Synchronize locale spoofing pref with our Firefox patch diff --git a/src/install.rdf b/src/install.rdf index 4148b3c..ae50323 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.0</em:version> + <em:version>1.8.0.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] Use the new security.ssl.disable_session_identifiers pref.
by mikeperry＠torproject.org 04 Nov '14

04 Nov '14

commit a609ff09f7ba996ac51da49bdcef3ee796d58959 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 26 19:06:17 2014 +0000 Use the new security.ssl.disable_session_identifiers pref. This is to reenable the TLS session tickets that are disabled by Tor Browser, so the TLS client hello matches that of stock Firefox. https://trac.torproject.org/projects/tor/ticket/13442#comment:1 https://trac.torproject.org/projects/tor/ticket/11183#comment:9 The previously used pref security.enable_tls_session_tickets has been removed and replaced by security.ssl.disable_session_identifiers. https://bugzilla.mozilla.org/show_bug.cgi?id=917049 https://bugzilla.mozilla.org/show_bug.cgi?id=967977 https://trac.torproject.org/projects/tor/ticket/10822 https://gitweb.torproject.org/tor-browser.git/commitdiff/5524ae43780e473831… --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index cddc237..eb94d1d 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -6,8 +6,8 @@ user_pref("browser.dom.window.dump.enabled", true); // Enable TLS session tickets (disabled by default in Tor Browser). Otherwise // there is a missing TLS extension. -// https://trac.torproject.org/projects/tor/ticket/11183#comment:9 -user_pref("security.enable_tls_session_tickets", true); +// https://trac.torproject.org/projects/tor/ticket/13442#comment:1 +user_pref("security.ssl.disable_session_identifiers", false); // Disable safe mode. In case of a crash, we don't want to prompt for a // safe-mode browser that has extensions disabled and no proxy.

1 0

[tor-browser-bundle/master] Update changelog for meek fix.
by mikeperry＠torproject.org 04 Nov '14

04 Nov '14

commit 40721d5393f5247fd1075886244fa77558e35ef2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Nov 3 19:20:37 2014 -0800 Update changelog for meek fix. --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 4098fe7..376a38b 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -12,6 +12,7 @@ Tor Browser 4.5-alpha-1 -- Nov 3 2014 * 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 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.

1 0

[torbutton/master] fixup! Bug #8641: TorButton popup menu that displays current Tor circuit
by mikeperry＠torproject.org 04 Nov '14

04 Nov '14

commit aeb53cde3f5765e8c5e7062afe9dba5b3fc68b50 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Nov 3 13:38:48 2014 -0800 fixup! Bug #8641: TorButton popup menu that displays current Tor circuit --- src/chrome/content/tor-circuit-display.js | 1 + src/modules/tor-control-port.js | 52 +++++++++++++++++++---------- 2 files changed, 36 insertions(+), 17 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 5f4d8bf..3a1fed8 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -41,6 +41,7 @@ let regionBundle = Services.strings.createBundle( // Convert a country code to a localized country name. // Example: `'de'` -> `'Deutschland'` in German locale. let localizedCountryNameFromCode = function (countryCode) { + if (typeof(countryCode) === "undefined") return ""; try { return regionBundle.GetStringFromName(countryCode.toLowerCase()); } catch (e) { diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index 2f993d7..855b34b 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -14,12 +14,23 @@ /* jshint esnext: true */ /* jshint -W097 */ -/* global Components, console */ +/* global Components, console, Services */ "use strict"; // ### Mozilla Abbreviations let {classes: Cc, interfaces: Ci, results: Cr, Constructor: CC, utils: Cu } = Components; +// ### Import Mozilla Services +Cu.import("resource://gre/modules/Services.jsm"); + +// ## torbutton logger +let logger = Cc["@torproject.org/torbutton-logger;1"] + .getService(Components.interfaces.nsISupports).wrappedJSObject, + log = x => logger.eclog(3, x); + +// ### announce this file +log("Loading tor-control-port.js\n"); + // ## io // I/O utilities namespace let io = io || {}; @@ -30,12 +41,12 @@ let io = io || {}; io.asyncSocketStreams = function (host, port) { let socketTransportService = Cc["@mozilla.org/network/socket-transport-service;1"] .getService(Components.interfaces.nsISocketTransportService), - BLOCKING = Ci.nsITransport.OPEN_BLOCKING, UNBUFFERED = Ci.nsITransport.OPEN_UNBUFFERED, - // Create an instance of a socket transport. + // Create an instance of a socket transport. socketTransport = socketTransportService.createTransport(null, 0, host, port, null), - // Open unbuffered synchronous outputStream. - outputStream = socketTransport.openOutputStream(BLOCKING | UNBUFFERED, 1, 1), + // Open unbuffered asynchronous outputStream. + outputStream = socketTransport.openOutputStream(UNBUFFERED, 1, 1) + .QueryInterface(Ci.nsIAsyncOutputStream), // Open unbuffered asynchronous inputStream. inputStream = socketTransport.openInputStream(UNBUFFERED, 1, 1) .QueryInterface(Ci.nsIAsyncInputStream); @@ -81,21 +92,28 @@ io.pumpInputStream = function (inputStream, onInputData, onError) { // socket.write(text) and socket.close(). onError will be passed the error object // whenever a write fails. io.asyncSocket = function (host, port, onInputData, onError) { - let [inputStream, outputStream] = io.asyncSocketStreams(host, port); + let [inputStream, outputStream] = io.asyncSocketStreams(host, port), + pendingWrites = []; // Run an input stream pump to send incoming data to the onInputData callback. io.pumpInputStream(inputStream, onInputData, onError); + // Return the "socket object" as described. return { // Write a message to the socket. write : function(aString) { - try { - outputStream.write(aString, aString.length); - // console.log(aString); - } catch (err) { - // This write() method is not necessarily called by a callback, - // but we pass any thrown errors to onError to ensure the socket - // error handling uses a consistent single path. - onError(err); - } + pendingWrites.push(aString); + outputStream.asyncWait( + // Implement an nsIOutputStreamCallback: + { onOutputStreamReady : function () { + let totalString = pendingWrites.join(""); + try { + outputStream.write(totalString, totalString.length); + log("wrote: " + aString + "\n"); + } catch (err) { + onError(err); + } + pendingWrites = []; + } }, + 0, 0, Services.tm.currentThread); }, // Close the socket. close : function () { @@ -146,7 +164,7 @@ io.onLineFromOnMessage = function (onMessage) { pendingLines = []; // Pass multiline message to onMessage. onMessage(message); - // console.log(message); + //log(message); } }; }; @@ -241,7 +259,7 @@ io.controlSocket = function (host, port, password, onError) { // Log in to control port. sendCommand("authenticate " + (password || "")); // Activate needed events. - sendCommand("setevents stream circ"); + sendCommand("setevents circ"); return { close : socket.close, sendCommand : sendCommand, addNotificationCallback : notificationDispatcher.addCallback, removeNotificationCallback : notificationDispatcher.removeCallback };

1 0

[tor-browser-bundle/master] Bump to build3 for 64bit osx fixes.
by mikeperry＠torproject.org 03 Nov '14

03 Nov '14

commit 31349ad13349e11a7f9343c4fec0fafe4cd2b44c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Nov 3 00:03:41 2014 -0800 Bump to build3 for 64bit osx fixes. --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 27ee9da..b84f92e 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,7 +8,7 @@ FIREFOX_VERSION=31.2.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build3 TOR_TAG=tor-0.2.6.1-alpha TORLAUNCHER_TAG=0.2.7.0.1 TORBUTTON_TAG=1.8.0.0

1 0

[tor-browser/tor-browser-31.2.0esr-4.5-1] It seems like we need to add one more path traversal for ESR31
by mikeperry＠torproject.org 03 Nov '14

03 Nov '14

commit 892f8b664e82abe2afb9b488f5e095c7d4006629 Author: Tom Ritter <tom(a)ritter.vg> Date: Mon Oct 27 11:31:20 2014 -0500 It seems like we need to add one more path traversal for ESR31 --- toolkit/library/dependentlibs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/library/dependentlibs.py b/toolkit/library/dependentlibs.py index 4331cfa..4889a1e 100644 --- a/toolkit/library/dependentlibs.py +++ b/toolkit/library/dependentlibs.py @@ -71,7 +71,7 @@ def dependentlibs_readelf(lib): def dependentlibs_otool(lib): '''Returns the list of dependencies declared in the given MACH-O dylib''' - proc = subprocess.Popen(["../../../../x-tools/x86_64-apple-darwin10/bin/" + TOOLCHAIN_PREFIX + 'otool', '-l', lib], stdout = subprocess.PIPE) + proc = subprocess.Popen(["../../../../../x-tools/x86_64-apple-darwin10/bin/" + TOOLCHAIN_PREFIX + 'otool', '-l', lib], stdout = subprocess.PIPE) deps= [] cmd = None for line in proc.stdout:

1 0

[tor-browser/tor-browser-31.2.0esr-4.5-1] Merge remote-tracking branch 'tjr/tor-browser-31.2.0esr-4.x-1-build1-64bit' into tor-browser-31.2.0esr-4.5-1
by mikeperry＠torproject.org 03 Nov '14

03 Nov '14

commit be0ac860051f1c3d61ee00a5d9140595981d3f2c Merge: e65a5a7 892f8b6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Nov 3 00:00:06 2014 -0800 Merge remote-tracking branch 'tjr/tor-browser-31.2.0esr-4.x-1-build1-64bit' into tor-browser-31.2.0esr-4.5-1 .mozconfig-mac | 4 ++-- toolkit/library/dependentlibs.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor-browser/tor-browser-31.2.0esr-4.5-1] Changes needed to build Mac in 64bit
by mikeperry＠torproject.org 03 Nov '14

03 Nov '14

commit b8b6d86a5b6407b9e0f42bfe1de188e5be49b47d Author: Tom Ritter <tom(a)ritter.vg> Date: Tue Sep 16 08:10:50 2014 -0500 Changes needed to build Mac in 64bit --- .mozconfig-mac | 4 ++-- toolkit/library/dependentlibs.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.mozconfig-mac b/.mozconfig-mac index 4abcc7c..2c06c34 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -2,7 +2,7 @@ export CROSS_COMPILE=1 SYSROOTDIR=/usr/lib/apple/SDKs/MacOSX10.6.sdk ROOTDIR="$HOME/build/x-tools/x86_64-apple-darwin10/bin" -FLAGS="-arch i386 -isysroot $SYSROOTDIR" +FLAGS="-arch x86_64 -isysroot $SYSROOTDIR" # Ideally we use the patch provided in # https://bugzilla.mozilla.org/show_bug.cgi?id=933071 to get rid of our path @@ -26,7 +26,7 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 -ac_add_options --target=i386-apple-darwin10 +ac_add_options --target=x86_64-apple-darwin10 ac_add_options --enable-application=browser ac_add_options --enable-strip ac_add_options --enable-official-branding diff --git a/toolkit/library/dependentlibs.py b/toolkit/library/dependentlibs.py index 43433a1b..4331cfa 100644 --- a/toolkit/library/dependentlibs.py +++ b/toolkit/library/dependentlibs.py @@ -71,7 +71,7 @@ def dependentlibs_readelf(lib): def dependentlibs_otool(lib): '''Returns the list of dependencies declared in the given MACH-O dylib''' - proc = subprocess.Popen(['otool', '-l', lib], stdout = subprocess.PIPE) + proc = subprocess.Popen(["../../../../x-tools/x86_64-apple-darwin10/bin/" + TOOLCHAIN_PREFIX + 'otool', '-l', lib], stdout = subprocess.PIPE) deps= [] cmd = None for line in proc.stdout:

1 0

[tor-browser-bundle/master] Bump TBB version for #3455 fixup.
by mikeperry＠torproject.org 01 Nov '14

01 Nov '14

commit a7f6793b95dba3e6f4bb1f2128eacfc83eb95ffa Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 31 14:15:14 2014 -0700 Bump TBB version for #3455 fixup. --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 8501889..27ee9da 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,7 +8,7 @@ FIREFOX_VERSION=31.2.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build2 TOR_TAG=tor-0.2.6.1-alpha TORLAUNCHER_TAG=0.2.7.0.1 TORBUTTON_TAG=1.8.0.0

1 0

[tor-browser/tor-browser-31.2.0esr-4.5-1] fixup! Bug #3455.1: Allow proxy settings to be set per URL bar domain.
by mikeperry＠torproject.org 01 Nov '14

01 Nov '14

commit e65a5a72227f5bb1915e5402fa945d0a9d3cf591 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Oct 31 10:20:31 2014 -0700 fixup! Bug #3455.1: Allow proxy settings to be set per URL bar domain. --- netwerk/base/src/nsProtocolProxyService.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netwerk/base/src/nsProtocolProxyService.cpp b/netwerk/base/src/nsProtocolProxyService.cpp index ed8b311..b4a6a9c 100644 --- a/netwerk/base/src/nsProtocolProxyService.cpp +++ b/netwerk/base/src/nsProtocolProxyService.cpp @@ -1020,7 +1020,7 @@ private: NS_IMPL_ISUPPORTS0(nsAsyncBridgeRequest) // nsProtocolProxyService -NS_IMETHODIMP +nsresult nsProtocolProxyService::DeprecatedBlockingResolve(nsIChannel *aChannel, uint32_t aFlags, nsIProxyInfo **retval)

1 0

[tor-browser-bundle/maint-4.0] update-responses: update to 4.0.1 with incremental mars from 4.0
by gk＠torproject.org 31 Oct '14

31 Oct '14

commit 023dc51f03c64a8f94f443e5a65ae25dd5f2c1bb Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Oct 31 10:34:59 2014 +0100 update-responses: update to 4.0.1 with incremental mars from 4.0 --- tools/update-responses/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index ad1c512..2132373 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -5,19 +5,19 @@ build_targets: win32: WINNT_x86-gcc3 osx32: Darwin_x86-gcc3 channels: - release: 4.0 - alpha: 4.0 + release: 4.0.1 + alpha: 4.0.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.0.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.0.1 incremental_from: - - 4.0-alpha-2 + - 4.0 # osx32: # minSupportedOSVersion: 10.7 # unsupported: 1

1 0

[tor-browser-bundle/master] Add correct obfs4 tag.
by gk＠torproject.org 31 Oct '14

31 Oct '14

commit a4ced3f804c6ef01e9585730a77ff31b4d46b203 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 31 06:58:13 2014 +0000 Add correct obfs4 tag. --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 0ec90b1..8501889 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -29,7 +29,7 @@ MEEK_TAG=0.11 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd -OBFS4_TAG=0.0.3 +OBFS4_TAG=obfs4proxy-0.0.3 GITIAN_TAG=tor-browser-builder-3.x-7

1 0

[tor-browser-bundle/master] Bump Torbutton version.
by mikeperry＠torproject.org 31 Oct '14

31 Oct '14

commit 32ff112863456763d210d2529a6fc0e0a9b7e76c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 30 17:55:14 2014 -0700 Bump Torbutton version. --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index e218a24..0ec90b1 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-build1 TOR_TAG=tor-0.2.6.1-alpha TORLAUNCHER_TAG=0.2.7.0.1 -TORBUTTON_TAG=1.7.0.1 +TORBUTTON_TAG=1.8.0.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

[tor-browser-bundle/master] Update changelog for 4.5-alpha-1
by mikeperry＠torproject.org 31 Oct '14

31 Oct '14

commit 714a2e84fee363e9477553b573c738d69e848dbc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 30 17:53:08 2014 -0700 Update changelog for 4.5-alpha-1 --- Bundle-Data/Docs/ChangeLog.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index b99e049..4098fe7 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,24 @@ +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 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 + * Update NoScript to 2.6.9.3 + * Update Torbutton to 1.8.0.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 + * 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" + * Mac + * Bug 10138: Switch to 64bit builds for MacOS + Tor Browser 4.0.1 -- Oct 30 2014 * All Platforms * Update Tor to 0.2.5.10

1 0

[torbutton/master] Update version and changelog for 1.8.0.0.
by mikeperry＠torproject.org 31 Oct '14

31 Oct '14

commit 978cac0e8d43caab6ddcfcb4a0b4634c375099ea Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 30 17:45:16 2014 -0700 Update version and changelog for 1.8.0.0. --- src/CHANGELOG | 6 ++++++ src/install.rdf | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index f889d61..0ad0e44 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,9 @@ +1.8.0.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 + 1.7.0.1 * Bug 13378: Prevent addon reordering in toolbars on first-run. diff --git a/src/install.rdf b/src/install.rdf index b4af033..4148b3c 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.7.0.1</em:version> + <em:version>1.8.0.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] Update translations from transifex.
by mikeperry＠torproject.org 31 Oct '14

31 Oct '14

commit 818f9b0a076dc31cc87544227aea164b07235276 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 30 17:47:47 2014 -0700 Update translations from transifex. --- src/chrome/locale/fa/torbutton.properties | 2 +- src/chrome/locale/pt/aboutTor.dtd | 12 ++++++------ src/chrome/locale/sv/aboutTor.dtd | 2 +- src/chrome/locale/sv/brand.dtd | 8 ++++---- src/chrome/locale/sv/brand.properties | 12 ++++++------ src/chrome/locale/sv/torbutton.dtd | 4 ++-- src/chrome/locale/sv/torbutton.properties | 14 +++++++------- src/chrome/locale/tr/aboutTor.dtd | 2 +- src/chrome/locale/tr/browser.properties | 4 ++-- src/chrome/locale/tr/torbutton.dtd | 20 ++++++++++---------- src/chrome/locale/tr/torbutton.properties | 2 +- 11 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties index 811125e..265aa65 100644 --- a/src/chrome/locale/fa/torbutton.properties +++ b/src/chrome/locale/fa/torbutton.properties @@ -48,7 +48,7 @@ torbutton.popup.confirm_plugins = پلاگینها مانند فلش، میتو torbutton.popup.never_ask_again = دیگر هیچگاه این را از من نپرس # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? +canvas.siteprompt=این وب‌سایت (%S) سعی دارد اطلاعات بوم تصویر HTML5 را دریافت کند که ممکن است برای شناسایی منحصر به فرد کامپیوتر شما استفاده شود.\n\nآیا مرورگر تور میبایست اجازه دریافت این اطلاعات را بدهد؟ canvas.notNow=نه در حال حاضر canvas.notNowAccessKey=N canvas.allow=اجازه دهید در آینده diff --git a/src/chrome/locale/pt/aboutTor.dtd b/src/chrome/locale/pt/aboutTor.dtd index dbff853..fd5cea7 100644 --- a/src/chrome/locale/pt/aboutTor.dtd +++ b/src/chrome/locale/pt/aboutTor.dtd @@ -21,7 +21,7 @@ <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label "."> -<!ENTITY aboutTor.search.label "Procurar"> +<!ENTITY aboutTor.search.label "Pesquisar"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> @@ -31,16 +31,16 @@ <!ENTITY aboutTor.torInfo3.label "Nó de saída:"> <!ENTITY aboutTor.torInfo4.label "Este servidor não guarda informação dos visitantes."> <!ENTITY aboutTor.whatnextQuestion.label "O que se segue?"> -<!ENTITY aboutTor.whatnextAnswer.label "Só por isso, o Tor não chega para navegar anónimamente na internet! Poderá ter que mudar alguns dos seus hábitos de navegação para ter a certeza que a sua identidade está segura."> +<!ENTITY aboutTor.whatnextAnswer.label "O Tor NÃO é tudo o que precisa para navegar anonimamente na internet! Poderá ter que mudar alguns dos seus hábitos de navegação para ter a certeza que a sua identidade está segura."> <!ENTITY aboutTor.whatnext.label "Dicas sobre como se tornar anónimo »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "Todos podem ajudar!"> +<!ENTITY aboutTor.helpInfo1.label "Você pode ajudar!"> <!ENTITY aboutTor.helpInfo2.label "Há muitas maneiras para ajudar a rede Tor tornar-se mais rápida e forte:"> -<!ENTITY aboutTor.helpInfo3.label "Pôr de pé um Nó de Relay Tor »"> +<!ENTITY aboutTor.helpInfo3.label "Criar um Nó de Relay Tor »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Voluntariar os seus Serviços »"> +<!ENTITY aboutTor.helpInfo4.label "Voluntarie os seus serviços »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Fazer uma doação »"> +<!ENTITY aboutTor.helpInfo5.label "Faça um donativo »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> <!ENTITY aboutTor.footer.label "O Projeto Tor é uma organização sem fins lucrativos US 501(c)(3) dedicada à investigação, desenvolvimento e promoção de anonimidade e privacidade online."> diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd index d3b5e1f..7fd6957 100644 --- a/src/chrome/locale/sv/aboutTor.dtd +++ b/src/chrome/locale/sv/aboutTor.dtd @@ -28,7 +28,7 @@ <!ENTITY aboutTor.torInfo1.label "Ytterligare information:"> <!ENTITY aboutTor.torInfo2.label "Land och IP-adress:"> -<!ENTITY aboutTor.torInfo3.label "Exit nod:"> +<!ENTITY aboutTor.torInfo3.label "Exitnod:"> <!ENTITY aboutTor.torInfo4.label "Den här servern sparar inte någon information om besökare."> <!ENTITY aboutTor.whatnextQuestion.label "Och nu då?"> <!ENTITY aboutTor.whatnextAnswer.label "Tor är INTE allt som behövs för att vara anonym på nätet! Du behöver kanske ändra några av dina vanor för att försäkra att din identitet förblir skyddad."> diff --git a/src/chrome/locale/sv/brand.dtd b/src/chrome/locale/sv/brand.dtd index 454646f..312a603 100644 --- a/src/chrome/locale/sv/brand.dtd +++ b/src/chrome/locale/sv/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "Tor webbläsaren"> -<!ENTITY brandFullName "Tor webbläsaren"> -<!ENTITY vendorShortName "Tor projektet"> -<!ENTITY trademarkInfo.part1 "Firefox och Firefox logotypen är varumärken tillhörande Mozilla Foundation."> +<!ENTITY brandShortName "Tor Browser"> +<!ENTITY brandFullName "Tor Browser"> +<!ENTITY vendorShortName "Tor-projektet"> +<!ENTITY trademarkInfo.part1 "Firefox och Firefox-logotypen är varumärken som tillhör Mozilla Foundation."> diff --git a/src/chrome/locale/sv/brand.properties b/src/chrome/locale/sv/brand.properties index 5212773..ae59c81 100644 --- a/src/chrome/locale/sv/brand.properties +++ b/src/chrome/locale/sv/brand.properties @@ -2,14 +2,14 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=Tor webbläsaren -brandFullName=Tor webbläsaren -vendorShortName=Tor projektet +brandShortName=Tor Browser +brandFullName=Tor Browser +vendorShortName=Tor Browser homePageSingleStartMain=Firefox Start, en snabb hemsida med inbyggd sökfunktion -homePageImport=Importera din hemsida från %S +homePageImport=Importera din startsida från %S -homePageMigrationPageTitle=Val av hemsida -homePageMigrationDescription=Välj den hemsida du önskar använda: +homePageMigrationPageTitle=Val av startsida +homePageMigrationDescription=Välj den startsida du vill använda: syncBrandShortName=Synka diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index fa580d4..67aafe8 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -103,7 +103,7 @@ <!ENTITY torbutton.prefs.block_nontor_file_net "Blockera Icke-Tor tillgång till nätverk från file:// länkar"> <!ENTITY torbutton.prefs.restore_defaults "Återställ till standard"> <!ENTITY torbutton.prefs.test_settings "Testa inställningar"> -<!ENTITY torbutton.prefs.test_auto "Testa mina Tor inställningar efter första gången jag växlar vid varje Firefox start"> +<!ENTITY torbutton.prefs.test_auto "Testa mina Tor-inställningar efter första gången jag växlar vid varje start av Firefox"> <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> <!ENTITY torbutton.prefs.tor_memory_jar "Skriv inte Tor kakor till disken"> <!ENTITY torbutton.prefs.nontor_memory_jar "Skriv inte Icke-Tor kakor till disken"> @@ -135,7 +135,7 @@ <!ENTITY torbutton.prefs.dtd_recommended "(rekommenderat)"> <!ENTITY torbutton.prefs.dtd_optional "(valfritt)"> <!ENTITY torbutton.prefs.dtd_crucial "(viktigt)"> -<!ENTITY torbutton.prefs.update_torbutton_via_tor "Dirigera om Torbutton uppdateringar genom Tor"> +<!ENTITY torbutton.prefs.update_torbutton_via_tor "Dirigera om Torbutton-uppdateringar genom Tor"> <!ENTITY torbutton.prefs.dodge_google_captcha "Använd automatiskt en alternativ sökmotor när du presenteras med en Google Captcha:"> <!ENTITY torbutton.prefs.engine1 "ixquick.com"> <!ENTITY torbutton.prefs.engine2 "Bing.com"> diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties index d1cc52a..d55e43a 100644 --- a/src/chrome/locale/sv/torbutton.properties +++ b/src/chrome/locale/sv/torbutton.properties @@ -17,7 +17,7 @@ torbutton.popup.test.failure = Tor proxy MISSLYCKADES! Kontrollera din proxy och torbutton.popup.test.confirm_toggle = Det senaste Tor proxy testet misslyckades att använda Tor.\n\nÄr du säker att du vill aktivera ändå?\n\nNotera: Om du fixat problemet kan du köra om testet i Torbuttons Proxy Preferenser för att eliminera denna varning. torbutton.popup.test.ff3_notice = Klicka på OK för att testa Tors proxyinställningar. Detta test kommer att ske i bakgrunden. Ha tålamod. torbutton.panel.label.verified = Tor verifierad -torbutton.popup.test.auto_failed = Den automatiska Tor proxy misslyckades att använda Tor.\n\nÄr du säker på att du vill aktivera ändå? +torbutton.popup.test.auto_failed = Den automatiska Tor-proxyn misslyckades att använda Tor.\n\nÄr du säker på att du vill aktivera ändå? torbutton.prefs.recommended = (rekommenderat) torbutton.prefs.optional = (valfritt) torbutton.prefs.crucial = (kritiskt) @@ -30,19 +30,19 @@ torbutton.popup.cancel = Avbryt torbutton.popup.dontask = Hämta hem filer automatiskt i fortsättningen torbutton.popup.test.no_http_proxy = Tor proxy test: Lokal HTTP Proxy är onåbar. Är Polipo igång ordentligt? torbutton.popup.captcha.title = Undvik Google Captchas? -torbutton.popup.captcha.ask = Torbutton upptäckte en Google Captcha. Vill du att omdirigeras till en annan sökmotor för den här frågan? +torbutton.popup.captcha.ask = Torbutton upptäckte en Google Captcha. Vill du omdirigeras till en annan sökmotor för den här frågan? torbutton.popup.captcha.always = Utför alltid denna åtgärd från och med nu torbutton.popup.redirect = Omdirigera torbutton.popup.no_redirect = Omdirigera inte -torbutton.popup.prompted_language = För att ge dig mer privatliv kan Torbutton begära en Engelsk version av webbsidor. Detta kan göra att webbsidor som du föredrar att läsa på ett annat språk visas på Engelska istället.\\\n\\\n Vill du visa sidor på Engelska för bättre privatliv? +torbutton.popup.prompted_language = För ett bättre integritetsskydd kan Torbutton begära den engelska versionen av webbsidor. Detta kan göra att webbsidor som du föredrar att läsa på ditt modersmål visas på engelska istället.\\\n\\\n Vill du visa sidor på engelska för att få ett bättre integritetsskydd? torbutton.popup.no_newnym = Torbutton kan inte säkert ge dig en ny identitet. Det har inte tillgång till Tor Control Port.\n\nKör du Tor Browser Bundle? -torbutton.popup.use_tbb = Det verkar som om du använder Torknappen med Firefox, vilket inte längre är en rekommenderad säker konfiguration.\n\nIstället rekommenderar vi dig att ladda ner den senaste Tor Browser Bundle genom att skicka ett mail till gettor(a)torproject.org eller ladda ner den på följande URL: +torbutton.popup.use_tbb = Det verkar som om du använder Torbutton med Firefox, vilket inte längre är en rekommenderad säker konfiguration.\n\nIstället rekommenderar vi dig att ladda ner den senaste Tor Browser Bundle genom att skicka ett mail till gettor(a)torproject.org eller ladda ner den på följande URL: torbutton.popup.pref_error = Torbutton kan inte uppdatera inställningar i Tor Browser profilen katalog. torbutton.popup.permission_denied = Du antingen återställa behörigheterna Tor Browser katalogen eller kopiera den till en ny plats. torbutton.popup.device_full = Skivan verkar vara full. Vänligen frigöra utrymme eller flytta Tor webbläsare till en ny enhet. -torbutton.title.prompt_torbrowser = Viktig Torbutton Information -torbutton.popup.prompt_torbrowser = Torbutton fungerar annorlunda nu: Du kan inte slå av den längre.\n\nVi gjorde denna förändring eftersom det inte är säkert att använda Torbutton i en webbläsare som också används för icke-Tor surfning. Det var för många buggar som vi inte kunde fixa på något annat sätt.\n\nOm du vill fortsätta använda Firefox normalt så bör du avinstallera Torknappen och ladda ner Tor Browser Bundle. Tor Webbläsaren skyddar ditt privatliv bättre än vanliga Firefox, även när Firefox används med Torknappen.\n\nFör att ta bort Torbutton, gå till Verktyg->Tillägg->Tillägg och klicka på Ta Bort knappen bredvid Torknappen. -torbutton.popup.short_torbrowser = Viktig Torbutton information!\n\nTorbutton är nu alltid aktiverad.\n\nKlicka på Torbutton för mer information. +torbutton.title.prompt_torbrowser = Viktig information om Torbutton +torbutton.popup.prompt_torbrowser = Torbutton fungerar annorlunda nu: Du kan inte slå av den längre.\n\nVi gjorde denna förändring eftersom det inte är säkert att använda Torbutton i en webbläsare som också används för icke-Tor surfning. Det var för många buggar som vi inte kunde fixa på något annat sätt.\n\nOm du vill fortsätta använda Firefox normalt så bör du avinstallera Tor Browser och ladda ner Tor Browser Bundle. Tor Browser skyddar ditt privatliv bättre än vanliga Firefox, även när Firefox används med Tor Browser.\n\nFör att ta bort Torbutton, gå till Verktyg->Tillägg->Tillägg och klicka på Ta bort-knappen bredvid Torbutton. +torbutton.popup.short_torbrowser = Viktig information om Torbutton!\n\nTorbutton är nu alltid aktiverad.\n\nKlicka på Torbutton för mer information. torbutton.popup.confirm_plugins = Insticksmoduler så som Flash kan äventyra din anonymitet och personliga integritet.\n\nDe kan också kringgå Tor för att avslöja var du befinner dig och vad din IP-adress är.\n\nÄr du säker på att du vill aktivera insticksmoduler?\n\n torbutton.popup.never_ask_again = Fråga aldrig igen diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd index 6e072c3..5e6e3e5 100644 --- a/src/chrome/locale/tr/aboutTor.dtd +++ b/src/chrome/locale/tr/aboutTor.dtd @@ -8,7 +8,7 @@ <!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ğan'a tıklayın ve Tor Tarayıcı'yı güncelleyin."> +<!ENTITY aboutTor.outOfDate2.label "Soğana tıklayın ve Tor Tarayıcı Paketi Güncellemesini İndir seçin."> <!ENTITY aboutTor.check.label "Tor Ağ ayarlarını test edin"> diff --git a/src/chrome/locale/tr/browser.properties b/src/chrome/locale/tr/browser.properties index c30bc36..295a03a 100644 --- a/src/chrome/locale/tr/browser.properties +++ b/src/chrome/locale/tr/browser.properties @@ -5,9 +5,9 @@ browser.startup.homepage=about:tor spellchecker.dictionary=en_US # Default search engine -browser.search.defaultenginename=BaşlagıçSayfası +browser.search.defaultenginename=Startpage # Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=BaşlagıçSayfası +browser.search.order.1=Startpage browser.search.order.2=DuckDuckGo browser.search.order.3=Google diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index e469873..f2f1762 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -11,7 +11,7 @@ <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Sunucusu:"> <!ENTITY torbutton.prefs.proxy.port "Bağl. Nok.:"> <!ENTITY torbutton.about.title "Torbutton Hakkında"> -<!ENTITY torbutton.about.version "Versiyon:"> +<!ENTITY torbutton.about.version "Sürüm:"> <!ENTITY torbutton.about.summary "Tor tarama gizliliğinizi korur."> <!ENTITY torbutton.about.code "Kodlarda yardımı bulunanlar:"> <!ENTITY torbutton.about.maintainer "Bakımcı:"> @@ -32,7 +32,7 @@ <!ENTITY torbutton.context_menu.about.key "H"> <!ENTITY torbutton.context_menu.networksettings "Ağ Ayarlarını Aç..."> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Tor Tarayıcı Destesi güncelleştirmesini yükleyin."> +<!ENTITY torbutton.context_menu.downloadUpdate "Tor Tarayıcı Paketi Güncelleştirmesini İndirin."> <!ENTITY torbutton.context_menu.downloadUpdate.key "H"> <!ENTITY torbutton.context_menu.cookieProtections "Çerez Korumaları"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> @@ -121,14 +121,14 @@ <!ENTITY torbutton.prefs.spoofdomain "Referans olarak alanı aldat"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.cookiedialog.title "Çerez Korumasını Yönet"> -<!ENTITY torbutton.cookiedialog.lockCol "Korunmuş"> +<!ENTITY torbutton.cookiedialog.lockCol "Korunan"> <!ENTITY torbutton.cookiedialog.domainCol "Sunucu"> <!ENTITY torbutton.cookiedialog.nameCol "İsim"> <!ENTITY torbutton.cookiedialog.pathCol "Yol"> -<!ENTITY torbutton.cookiedialog.protectCookie "Çerezi sakla"> -<!ENTITY torbutton.cookiedialog.removeCookie "Çerezi sil"> -<!ENTITY torbutton.cookiedialog.unprotectCookie "Çerezi korumayı sonlandır"> -<!ENTITY torbutton.cookiedialog.removeAllBut "Korunanlar hariç tümünü sil"> +<!ENTITY torbutton.cookiedialog.protectCookie "Çerezi Koru"> +<!ENTITY torbutton.cookiedialog.removeCookie "Çerezi Sil"> +<!ENTITY torbutton.cookiedialog.unprotectCookie "Çerezi Korumayı Sonlandır"> +<!ENTITY torbutton.cookiedialog.removeAllBut "Korunanlar Hariç Tümünü Sil"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Yeni çerezleri koru"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Yeni çerezleri koruma"> <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> @@ -145,6 +145,6 @@ <!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.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 "Flash gibi tarayıcı eklentilerini engelle."> -<!ENTITY torbutton.prefs.resist_fingerprinting "Diğer Tor kullanıcılardan sizi ayıran detayları değiştirin."> +<!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"> diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties index b857f82..5a39ac2 100644 --- a/src/chrome/locale/tr/torbutton.properties +++ b/src/chrome/locale/tr/torbutton.properties @@ -34,7 +34,7 @@ torbutton.popup.captcha.ask = Google Captcha algılandı. Aramana devam etmek i torbutton.popup.captcha.always = Bu ayarı şu andan itibaren sürekli hale getir\n torbutton.popup.redirect = Yönlendir torbutton.popup.no_redirect = Yönlendirme -torbutton.popup.prompted_language = Daha fazla gizlilik icin, Torbutton sayfaların İngilizce versiyonlarını göstermeye çalışır. Bu özellik sayfaları ana dilinizde görememenize sebep olabilir.\n\nSiz de daha fazla gizlilik için sayfaların İngilizce sürümlerini görüntülemek ister misiniz? +torbutton.popup.prompted_language = Daha fazla gizlilik icin, Torbutton sayfaların İngilizce sürümlerini göstermeyi talep edebilir. Bu özellik, sayfaların ana diliniz yerine İngilizce görüntülenmesine sebep olabilir.\n\nDaha iyi gizlilik için sayfaların İngilizce sürümlerinin talep edilmesini ister misiniz? torbutton.popup.no_newnym = Torbutton size güvenli yeni bir kimlik sağlayamadı. Tor Control Port una giriş yapılamıyor.\n\nTor Browser Bundle nin çalıştığından emin olun. torbutton.popup.use_tbb = Görünüşe göre Torbutton'ı Firefox ile kullanıyorsunuz, bu tavsiye edilen bir güvenlik ayarlaması değildir.\n\nAslında, Size tavsiyemiz Tor Tarayıcısını gettor(a)torproject.org adresine e-posta göndererek veya şu adrese girerek edinmenizdir. torbutton.popup.pref_error = Torbutton, Tor Browser profil klasörünün içinde seçenekleri güncelleyemez.

1 0

[tor-browser-bundle/master] Fix Expert Bundle filename+version.
by mikeperry＠torproject.org 31 Oct '14

31 Oct '14

commit c74bb8b7ae32100a02471be4439aa92b001fdcf7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 30 17:07:45 2014 -0700 Fix Expert Bundle filename+version. --- gitian/mkbundle-windows.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 62e1c69..e950884 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -225,7 +225,7 @@ then mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/ cp -a build/out/*.exe $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 - cp -a inputs/tor-win32-gbuilt.zip $WRAPPER_DIR/$TORBROWSER_VERSION/tor-win32-${TOR_TAG_ORIG}.zip || exit 1 + cp -a inputs/tor-win32-gbuilt.zip $WRAPPER_DIR/$TORBROWSER_VERSION/tor-win32-${TOR_TAG_ORIG:4}.zip || exit 1 touch inputs/bundle-windows.gbuilt else echo

1 0

[tor-browser-bundle/master] Bump tor version to 0.2.6.1 in the alpha series.
by mikeperry＠torproject.org 31 Oct '14

31 Oct '14

commit a7de826b620d31992277d881484985d58af9540f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 30 17:07:27 2014 -0700 Bump tor version to 0.2.6.1 in the alpha series. --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 1e546bf..e218a24 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -9,7 +9,7 @@ FIREFOX_VERSION=31.2.0esr TORBROWSER_UPDATE_CHANNEL=alpha TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build1 -TOR_TAG=tor-0.2.5.10 +TOR_TAG=tor-0.2.6.1-alpha TORLAUNCHER_TAG=0.2.7.0.1 TORBUTTON_TAG=1.7.0.1 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630

1 0

[tor-browser-bundle/master] Bug #13443: Update mingw-w64 for DirectShow com ptr fix.
by mikeperry＠torproject.org 31 Oct '14

31 Oct '14

commit 68f93d2963dcbf1e1cb3f91d3686f48a682b37ae Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 30 15:27:55 2014 -0700 Bug #13443: Update mingw-w64 for DirectShow com ptr fix. --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index c4b65c3..1e546bf 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -16,7 +16,7 @@ HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable -MINGW_TAG=469ed5d227202b373409c8a3b4c1358be39b9983 # XXX: ??? +MINGW_TAG=e712bb8b106d059914388e6ccd93c584a6416082 # XXX: ??? PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 FLASHPROXY_TAG=1.6

1 0