- tbb-commits - lists.torproject.org

[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

[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

[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] 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 31 Oct '14

31 Oct '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 31 Oct '14

31 Oct '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