February 2015 - tbb-commits - lists.torproject.org

[torbutton/master] Add changelog for 1.9.0.0 + bump version.
by mikeperry＠torproject.org 19 Feb '15

19 Feb '15

commit a50335676cb8d62eb255f0ce206b82cb553e0fc5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 18 12:36:27 2015 -0800 Add changelog for 1.9.0.0 + bump version. --- src/CHANGELOG | 19 +++++++++++++++++++ src/install.rdf | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index a3e859e..11fa776 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,22 @@ +1.9.0.0 + * Bug 13882: Fix display of bridges after bridge settings have been changed + * Bug 5698: Use "Tor Browser" branding in "About Tor Browser" dialog + * Bug 10280: Strings and pref for preventing plugin initialization. + * Bug 14866: Show correct circuit when more than one exists for a given domain + * Bug 9442: Add New Circuit button to Torbutton menu + * Bug 9906: Warn users before closing all windows and performing new identity. + * Bug 8400: Prompt for restart if disk records are enabled/disabled. + * Bug 14630: Hide Torbutton's proxy settings tab. + * Bug 14632: Disable Cookie Manager until we get it working. + * Bug 11175: Remove "About Torbutton" from onion menu. + * Bug 13900: Remove SafeCache code. + * Bug 14490: Use Disconnect search in about:tor search box + * Bug 14392: Don't steal input focus in about:tor search box + * Bug 11236: Don't set omnibox order in Torbutton (to prevent translation) + * Bug 13406: Stop directing users to download-easy.html.en on update + * Bug 9387: Handle "custom" mode better in Security Slider + * Bug 12430: Bind jar: pref to Security Slider + 1.8.1.3 * Bug 13998: Handle changes in NoScript 2.6.9.8+ * Bug 14100: Option to hide NetworkSettings menuitem diff --git a/src/install.rdf b/src/install.rdf index e4045ad..b5a8e88 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.3</em:version> + <em:version>1.9.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] Merge remote-tracking branch 'arthur/13882+'
by mikeperry＠torproject.org 19 Feb '15

19 Feb '15

commit 3692388e5262cd6a5b9ffcd1a950b04e56933e18 Merge: 7fd169e de8cb7a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 18 11:41:32 2015 -0800 Merge remote-tracking branch 'arthur/13882+' src/chrome/content/tor-circuit-display.js | 71 ++++++++++------------- src/modules/tor-control-port.js | 88 ++++++++++++++++++++++------- 2 files changed, 99 insertions(+), 60 deletions(-)

1 0

[torbutton/master] Bug #13882: Fix display of bridges after bridge settings have been changed
by mikeperry＠torproject.org 19 Feb '15

19 Feb '15

commit de8cb7a32e0d2a70812322ce1d6a1f4627ef33f0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Feb 16 17:47:13 2015 -0800 Bug #13882: Fix display of bridges after bridge settings have been changed --- src/chrome/content/tor-circuit-display.js | 71 ++++++++++------------- src/modules/tor-control-port.js | 88 ++++++++++++++++++++++------- 2 files changed, 99 insertions(+), 60 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 35a7dfc..e2628b4 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -43,41 +43,23 @@ let logger = Cc["@torproject.org/torbutton-logger;1"] let credentialsToNodeDataMap = {}, // A mutable map that reports `true` for IDs of "mature" circuits // (those that have conveyed a stream). - knownCircuitIDs = {}, - // A map from bridge fingerprint to its IP address. - bridgeIDtoIPmap = new Map(); + knownCircuitIDs = {}; // __trimQuotes(s)__. // Removes quotation marks around a quoted string. let trimQuotes = s => s ? s.match(/^\"(.*)\"$/)[1] : undefined; -// __readBridgeIPs(controller)__. -// Gets a map from bridge ID to bridge IP, and stores it -// in `bridgeIDtoIPmap`. -let readBridgeIPs = function (controller) { - Task.spawn(function* () { - let configText = yield controller.getInfo("config-text"), - bridgeEntries = configText.Bridge; - if (bridgeEntries) { - bridgeEntries.map(entry => { - let IPplusPort, ID, - tokens = entry.split(/\s+/); - // First check if we have a "vanilla" bridge: - if (tokens[0].match(/^\d+\.\d+\.\d+\.\d+/)) { - [IPplusPort, ID] = tokens; - // Several bridge types have a similar format: - } else if (["fte", "obfs3", "obfs4", "scramblesuit"] - .indexOf(tokens[0]) >= 0) { - [IPplusPort, ID] = tokens.slice(1); - } - // (For now, we aren't dealing with meek bridges and flashproxy.) - if (IPplusPort && ID) { - let IP = IPplusPort.split(":")[0]; - bridgeIDtoIPmap.set(ID.toUpperCase(), IP); - } - }); +// __getBridge(id)__. +// Gets the bridge parameters for a given node ID. If the node +// is not currently used as a bridge, returns null. +let getBridge = function* (controller, id) { + let bridges = yield controller.getConf("bridge"); + for (let bridge of bridges) { + if (bridge.ID.toUpperCase() === id.toUpperCase()) { + return bridge; } - }).then(null, Cu.reportError); + } + return null; }; // nodeDataForID(controller, id)__. @@ -85,17 +67,22 @@ let readBridgeIPs = function (controller) { // Example: `nodeDataForID(controller, "20BC91DC525C3DC9974B29FBEAB51230DE024C44")` // => `{ type : "default", ip : "12.23.34.45", countryCode : "fr" }` let nodeDataForID = function* (controller, id) { - let result = {}; // type, ip, countryCode; - if (bridgeIDtoIPmap.has(id.toUpperCase())) { - result.ip = bridgeIDtoIPmap.get(id.toUpperCase()); + let result = {}, + bridge = yield getBridge(controller, id); // type, ip, countryCode; + if (bridge) { result.type = "bridge"; - } else { - // Get the IP address for the given node ID. + result.bridgeType = bridge.type; + // Attempt to get an IP address from bridge address string. try { - let statusMap = yield controller.getInfo("ns/id/" + id); - result.ip = statusMap.IP; + result.ip = bridge.address.split(":")[0]; } catch (e) { } + } else { result.type = "default"; + // Get the IP address for the given node ID. + try { + let statusMap = yield controller.getInfo("ns/id/" + id); + result.ip = statusMap.IP; + } catch (e) { } } if (result.ip) { // Get the country code for the node's IP address. @@ -141,8 +128,10 @@ let collectIsolationData = function (aController) { logger.eclog(3, "streamEvent.CircuitID: " + streamEvent.CircuitID); knownCircuitIDs[streamEvent.CircuitID] = true; let circuitStatus = yield getCircuitStatusByID(aController, streamEvent.CircuitID), - credentials = trimQuotes(circuitStatus.SOCKS_USERNAME) + ":" + - trimQuotes(circuitStatus.SOCKS_PASSWORD); + credentials = circuitStatus ? + (trimQuotes(circuitStatus.SOCKS_USERNAME) + ":" + + trimQuotes(circuitStatus.SOCKS_PASSWORD)) : + null; if (credentials) { let nodeData = yield nodeDataForCircuit(aController, circuitStatus); credentialsToNodeDataMap[credentials] = nodeData; @@ -195,11 +184,12 @@ let showCircuitDisplay = function (show) { // `"France (12.34.56.78)"`. let nodeLines = function (nodeData) { let result = [uiString("this_browser")]; - for (let {ip, countryCode, type} of nodeData) { + for (let {ip, countryCode, type, bridgeType} of nodeData) { let bridge = type === "bridge"; result.push((countryCode ? localizedCountryNameFromCode(countryCode) : uiString("unknown_country")) + - " (" + (bridge ? uiString("tor_bridge") + " (" + (bridge ? (uiString("tor_bridge") + + ((bridgeType !== "vanilla") ? (": " + bridgeType) : "")) : (ip || uiString("ip_unknown"))) + ")"); } result[4] = uiString("internet"); @@ -340,7 +330,6 @@ let setupDisplay = function (host, port, password, enablePrefName) { logger.eclog(5, "Disabling tor display circuit because of an error."); stop(); }); - readBridgeIPs(myController); syncDisplayWithSelectedTab(true); collectIsolationData(myController); } diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index 3fa7756..a55a0d8 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -372,22 +372,22 @@ utils.listMapData = function (parameterString, listNames) { }; // ## info -// A namespace for functions related to tor's GETINFO command. +// A namespace for functions related to tor's GETINFO and GETCONF command. let info = info || {}; // __info.keyValueStringsFromMessage(messageText)__. -// Takes a message (text) response to GETINFO and provides a series of key-value -// strings, which are either multiline (with a `250+` prefix): +// Takes a message (text) response to GETINFO or GETCONF and provides +// a series of key-value strings, which are either multiline (with a `250+` prefix): // // 250+config/defaults= // AccountingMax "0 bytes" // AllowDotExit "0" // . // -// or single-line (with a `250-` prefix): +// or single-line (with a `250-` or `250 ` prefix): // // 250-version=0.2.6.0-alpha-dev (git-b408125288ad6943) -info.keyValueStringsFromMessage = utils.extractor(/^(250\+[\s\S]+?^\.|250-.+?)$/gmi); +info.keyValueStringsFromMessage = utils.extractor(/^(250\+[\s\S]+?^\.|250[-\ ].+?)$/gmi); // __info.applyPerLine(transformFunction)__. // Returns a function that splits text into lines, @@ -462,9 +462,33 @@ info.configTextParser = function(text) { return result; }; + +// __info.bridgeParser(bridgeLine)__. +// Takes a single line from a `getconf bridge` result and returns +// a map containing the bridge's type, address, and ID. +info.bridgeParser = function(bridgeLine) { + let result = {}, + tokens = bridgeLine.split(/\s+/); + // First check if we have a "vanilla" bridge: + if (tokens[0].match(/^\d+\.\d+\.\d+\.\d+/)) { + result.type = "vanilla"; + [result.address, result.ID] = tokens; + // Several bridge types have a similar format: + } else { + result.type = tokens[0]; + if (["fte", "obfs3", "obfs4", "scramblesuit"] + .indexOf(result.type) >= 0) { + [result.address, result.ID] = tokens.slice(1); + } else if (result.type === "meek") { + // do nothing for now + } + } + return result.type ? result : null; +}; + // __info.parsers__. -// A map of GETINFO keys to parsing function, which convert result strings to JavaScript -// data. +// A map of GETINFO and GETCONF keys to parsing function, which convert +// result strings to JavaScript data. info.parsers = { "version" : utils.identity, "config-file" : utils.identity, @@ -474,7 +498,8 @@ info.parsers = { "ns/name/" : info.routerStatusParser, "ip-to-country/" : utils.identity, "circuit-status" : info.applyPerLine(info.circuitStatusParser), - "stream-status" : info.applyPerLine(info.streamStatusParser) + "stream-status" : info.applyPerLine(info.streamStatusParser), + "bridge" : info.bridgeParser }; // __info.getParser(key)__. @@ -482,22 +507,37 @@ info.parsers = { // convert its corresponding valueString to JavaScript data. info.getParser = function(key) { return info.parsers[key] || - info.parsers[key.substring(0, key.lastIndexOf("/") + 1)] || - "unknown"; + info.parsers[key.substring(0, key.lastIndexOf("/") + 1)]; }; // __info.stringToValue(string)__. -// Converts a key-value string as from GETINFO to a value. +// Converts a key-value string as from GETINFO or GETCONF to a value. info.stringToValue = function (string) { // key should look something like `250+circuit-status=` or `250-circuit-status=...` - let key = string.match(/^250[\+-](.+?)=/mi)[1], - // matchResult finds a single-line result for `250-` or a multi-line one for `250+`. - matchResult = string.match(/250\-.+?=(.*?)$/mi) || + // or `250 circuit-status...` + let matchForKey = string.match(/^250[ +-](.+?)=/mi), + key = matchForKey ? matchForKey[1] : null; + if (key === null) return null; + // matchResult finds a single-line result for `250-` or a multi-line one for `250+`. + let matchResult = string.match(/250[ -].+?=(.*?)$/mi) || string.match(/250\+.+?=([\s\S]*?)^\.$/mi), // Retrieve the captured group (the text of the value in the key-value pair) - valueString = matchResult ? matchResult[1] : null; - // Return value where the latter has been parsed according to the key requested. - return info.getParser(key)(valueString); + valueString = matchResult ? matchResult[1] : null, + // Get the parser functino for the key found. + parse = info.getParser(key.toLowerCase()); + if (parse === undefined) { + throw new Error("No parser found for '" + key + "'"); + } + // Return value produced by the parser. + return parse(valueString); +}; + +// __info.getMultipleResponseValues(message)__. +// Process multiple responses to a GETINFO or GETCONF request. +info.getMultipleResponseValues = function (message) { + return info.keyValueStringsFromMessage(message) + .map(info.stringToValue) + .filter(utils.identity); }; // __info.getInfoMultiple(aControlSocket, keys)__. @@ -519,8 +559,7 @@ info.getInfoMultiple = function (aControlSocket, keys) { } */ return aControlSocket.sendCommand("getinfo " + keys.join(" ")) - .then(message => info.keyValueStringsFromMessage(message) - .map(info.stringToValue)); + .then(info.getMultipleResponseValues); }; // __info.getInfo(controlSocket, key)__. @@ -537,6 +576,16 @@ info.getInfo = function (aControlSocket, key) { return info.getInfoMultiple(aControlSocket, [key]).then(data => data[0]); }; +// __info.getConf(aControlSocket, key)__. +// Sends GETCONF for a single key. Returns a promise with the result. +info.getConf = function (aControlSocket, key) { + // GETCONF with a single argument returns results that look like + // results from GETINFO with multiple arguments. + // So we can use the same kind of parsing for + return aControlSocket.sendCommand("getconf " + key) + .then(info.getMultipleResponseValues); +}; + // ## event // Handlers for events @@ -587,6 +636,7 @@ tor.controller = function (host, port, password, onError) { isOpen = true; return { getInfo : key => info.getInfo(socket, key), getInfoMultiple : keys => info.getInfoMultiple(socket, keys), + getConf : key => info.getConf(socket, key), watchEvent : function (type, filter, onData) { event.watchEvent(socket, type, filter, onData); },

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 19 Feb '15

19 Feb '15

commit 9a5a1cec6b3449c1f5f3706823ec5b1ff31e40d0 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 18 14:21:49 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. It turns out that the fix for #11236 still contains too much randomnees for our taste if more than two search engines are specified to be on the top. Fall back to just two. --- browser/app/profile/000-tor-browser.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index cb59517..ceb9394 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -153,11 +153,11 @@ pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\" pref("browser.search.defaultenginename", "Search"); // Search engine order (order displayed in the search bar dropdown) -// Somewhat surprisingly we get Disconnect - YouTube - Twitter as the order -// only if we set them as below. -pref("browser.search.order.extra.1", "YouTube"); -pref("browser.search.order.extra.2", "Twitter"); -pref("browser.search.order.extra.3", "Search"); +// Somewhat surprisingly we get some random behavior if we specify more than +// two search engines as below. See +// https://bugzilla.mozilla.org/show_bug.cgi?id=1126722 for details. +pref("browser.search.order.extra.1", "Search"); +pref("browser.search.order.extra.2", "YouTube"); // Hacks/workarounds: Direct2D seems to crash w/ lots of video cards w/ MinGW? // Nvida cards also experience crashes without the second pref set to disabled

1 0

[tor-browser-bundle/master] Bug 13717: Make sure we use the bash on Linux
by gk＠torproject.org 19 Feb '15

19 Feb '15

commit d02cbafea85464044e2117913310ddd77c81efc7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 18 16:53:08 2015 +0000 Bug 13717: Make sure we use the bash on Linux This is basically a patch by a cypherpunk. Additionally, this commit contains a small clean-up of the shell script. --- RelativeLink/RelativeLink.sh | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index e75482a..8c51f47 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -5,20 +5,28 @@ # # To run in debug mode simply pass --debug # -# Copyright 2014 The Tor Project. See LICENSE for licensing information. +# Copyright 2015 The Tor Project. See LICENSE for licensing information. -complain_dialog_title="Tor Browser Bundle" +complain_dialog_title="Tor Browser" # First, make sure DISPLAY is set. If it isn't, we're hosed; scream # at stderr and die. if [ "x$DISPLAY" = "x" ]; then - echo "$complain_dialog_title must be run within the X Window System." >&2 - echo "Exiting." >&2 - exit 1 + echo "$complain_dialog_title must be run within the X Window System." >&2 + echo "Exiting." >&2 + exit 1 +fi + +# Second, make sure this script wasn't started as 'sh start-tor-browser' or +# similar. +if [ "x$BASH" = "x" ]; then + echo "$complain_dialog_title should be started as './start-tor-browser'" + echo "Exiting." >&2 + exit 1; fi -# Do not (try to) connect to the session manager -unset SESSION_MANAGER +# Do not (try to) connect to the session manager +unset SESSION_MANAGER # Determine whether we are running in a terminal. If we are, we # should send our error messages to stderr...

1 0

[tor-browser-bundle/master] Switch to obfs4proxy-0.0.4, and remove references to go.crypto.
by gk＠torproject.org 18 Feb '15

18 Feb '15

commit dd5f93f2fc8721ee83f1dbe650a877fe68b1b43a Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Tue Feb 17 12:41:24 2015 +0000 Switch to obfs4proxy-0.0.4, and remove references to go.crypto. The new version of obfs4proxy uses golang.org/x/crypto, which has been already integrated as part of the nightly build process, so this is a tag change and removal of the deprecated library only. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 12 ------------ gitian/descriptors/mac/gitian-pluggable-transports.yml | 12 ------------ gitian/descriptors/windows/gitian-pluggable-transports.yml | 12 ------------ gitian/fetch-inputs.sh | 5 ++--- gitian/verify-tags.sh | 2 +- gitian/versions.alpha | 5 +---- gitian/versions.nightly | 3 --- 7 files changed, 4 insertions(+), 47 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index d180f97..9596b7f 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -54,7 +54,6 @@ files: - "gmp-linux64-utils.zip" - "openssl-linux32-utils.zip" - "openssl-linux64-utils.zip" -- "go.crypto.tar.bz2" - "go.net.tar.bz2" script: | INSTDIR="$HOME/install" @@ -254,17 +253,6 @@ script: | go install golang.org/x/crypto/nacl/secretbox cd .. - # Building go.crypto (obfs4proxy <= 0.0.3) - tar xjf go.crypto.tar.bz2 - cd go.crypto - find -type f | xargs touch --date="$REFERENCE_DATETIME" - mkdir -p "$GOPATH/src/code.google.com/p/" - ln -sf "$PWD" "$GOPATH/src/code.google.com/p/go.crypto" - go install code.google.com/p/go.crypto/curve25519 - go install code.google.com/p/go.crypto/hkdf - go install code.google.com/p/go.crypto/nacl/secretbox - cd .. - # Building go.net tar xjf go.net.tar.bz2 cd go.net diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 9a86b1a..a1bdff9 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -50,7 +50,6 @@ files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" -- "go.crypto.tar.bz2" - "go.net.tar.bz2" - "gmp-mac64-utils.zip" - "openssl-mac64-utils.zip" @@ -282,17 +281,6 @@ script: | go install golang.org/x/crypto/nacl/secretbox cd .. - # Building go.crypto (obfs4proxy <= 0.0.3) - tar xjf go.crypto.tar.bz2 - cd go.crypto - find -type f | xargs touch --date="$REFERENCE_DATETIME" - mkdir -p "$GOPATH/src/code.google.com/p/" - ln -sf "$PWD" "$GOPATH/src/code.google.com/p/go.crypto" - go install code.google.com/p/go.crypto/curve25519 - go install code.google.com/p/go.crypto/hkdf - go install code.google.com/p/go.crypto/nacl/secretbox - cd .. - # Building go.net tar xjf go.net.tar.bz2 cd go.net diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 6e3c3a7..4ca477e 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -57,7 +57,6 @@ files: - "openssl-win32-utils.zip" - "gmp-win32-utils.zip" - "gcclibs-win32-utils.zip" -- "go.crypto.tar.bz2" - "go.net.tar.bz2" script: | # Set the timestamp on every .pyc file in a zip file, and re-dzip the zip file. @@ -360,17 +359,6 @@ script: | go install golang.org/x/crypto/nacl/secretbox cd .. - # Building go.crypto (obfs4proxy <= 0.0.3) - tar xjf go.crypto.tar.bz2 - cd go.crypto - find -type f | xargs touch --date="$REFERENCE_DATETIME" - mkdir -p "$GOPATH/src/code.google.com/p/" - ln -sf "$PWD" "$GOPATH/src/code.google.com/p/go.crypto" - go install code.google.com/p/go.crypto/curve25519 - go install code.google.com/p/go.crypto/hkdf - go install code.google.com/p/go.crypto/nacl/secretbox - cd .. - # Building go.net tar xjf go.net.tar.bz2 cd go.net diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index fdbbc69..e58c4d3 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -165,7 +165,7 @@ done # XXX/Yawning. As far as I can tell, this gitian thing doesn't support # fetching from hg repositories. -for i in GOCRYPTO GONET +for i in GONET do PACKAGE="${i}_PACKAGE" URL="${MIRROR_URL_YAWNING}${!PACKAGE}" @@ -178,7 +178,7 @@ wget -U "" -N ${HTTPSE_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC GOCRYPTO GONET +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC GONET do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -233,7 +233,6 @@ ln -sf "$LXML_PACKAGE" lxml.tar.gz ln -sf "$PARSLEY_PACKAGE" parsley.tar.gz ln -sf "$GO_PACKAGE" go.tar.gz ln -sf "$GONET_PACKAGE" go.net.tar.bz2 -ln -sf "$GOCRYPTO_PACKAGE" go.crypto.tar.bz2 # Fetch latest gitian-builder itself # XXX - this is broken if a non-standard inputs dir is selected using the command line flag. diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index df30143..eb1e057 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -140,7 +140,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC GOCRYPTO GONET +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC GONET do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions.alpha b/gitian/versions.alpha index e5668f2..0e258aa 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -30,7 +30,7 @@ FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300 -OBFS4_TAG=obfs4proxy-0.0.3 +OBFS4_TAG=obfs4proxy-0.0.4 GITIAN_TAG=tor-browser-builder-3.x-7 @@ -78,7 +78,6 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz -GOCRYPTO_PACKAGE=go.crypto-5478be1963aa.tar.bz2 GONET_PACKAGE=go.net-9c0f9daaa74b.tar.bz2 # Hashes for packages with weak sigs or no sigs @@ -101,7 +100,6 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e -GOCRYPTO_HASH=a8e301714f5724999321f0397b867a5670a5e5c4f808ba157bdd93ee0d028827 GONET_HASH=1812fec55256e1a6fe546111cc658520b80972f38826c94ec11ef24315d32353 ## Non-git package URLs @@ -128,5 +126,4 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=http://golang.org/dl/${GO_PACKAGE} -GOCRYPTO_URL=https://people.torproject.org/~yawning/mirrors/sources/${GOCRYPTO_PACKAGE} GONET_URL=https://people.torproject.org/~yawning/mirrors/sources/${GONET_PA… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 16519f5..a619cad 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -82,7 +82,6 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz -GOCRYPTO_PACKAGE=go.crypto-5478be1963aa.tar.bz2 GONET_PACKAGE=go.net-9c0f9daaa74b.tar.bz2 # Hashes for packages with weak sigs or no sigs @@ -105,7 +104,6 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e -GOCRYPTO_HASH=a8e301714f5724999321f0397b867a5670a5e5c4f808ba157bdd93ee0d028827 GONET_HASH=1812fec55256e1a6fe546111cc658520b80972f38826c94ec11ef24315d32353 ## Non-git package URLs @@ -132,5 +130,4 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=http://golang.org/dl/${GO_PACKAGE} -GOCRYPTO_URL=https://people.torproject.org/~yawning/mirrors/sources/${GOCRYPTO_PACKAGE} GONET_URL=https://people.torproject.org/~yawning/mirrors/sources/${GONET_PA…

1 0

[tor-browser-bundle/master] Switch the scramblesuit pluggable transport provider to obfs4proxy.
by gk＠torproject.org 18 Feb '15

18 Feb '15

commit 092dbbf7ee2a1a29a386f50dc1a1bec17a398f6b Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Tue Feb 17 12:42:34 2015 +0000 Switch the scramblesuit pluggable transport provider to obfs4proxy. --- Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 5 +---- Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 5 +---- Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index 50e03fd..d0885ff 100644 --- a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -1,11 +1,8 @@ ## fteproxy configuration ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.bin --managed -## obfsproxy configuration -ClientTransportPlugin scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfsproxy.bin managed - ## obfs4proxy configuration -ClientTransportPlugin obfs2,obfs3,obfs4 exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy +ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy ## flash proxy configuration # diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix index 604098f..0dee29b 100644 --- a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -1,11 +1,8 @@ ## fteproxy configuration ClientTransportPlugin fte exec PluggableTransports/fteproxy.bin --managed -## obfsproxy configuration -ClientTransportPlugin scramblesuit exec PluggableTransports/obfsproxy.bin managed - ## obfs4proxy configuration -ClientTransportPlugin obfs2,obfs3,obfs4 exec PluggableTransports/obfs4proxy +ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/obfs4proxy ## flash proxy configuration # diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index d92d201..f287e3e 100644 --- a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -1,11 +1,8 @@ ## fteproxy configuration ClientTransportPlugin fte exec TorBrowser\Tor\PluggableTransports\fteproxy --managed -## obfsproxy configuration -ClientTransportPlugin scramblesuit exec TorBrowser\Tor\PluggableTransports\obfsproxy managed - ## obfs4proxy configuration -ClientTransportPlugin obfs2,obfs3,obfs4 exec TorBrowser\Tor\PluggableTransports\obfs4proxy +ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy ## flash proxy configuration #

1 0

[tor-browser-bundle/master] Merge branch 'bug14919'
by gk＠torproject.org 18 Feb '15

18 Feb '15

commit c268ca1dab6a1dbcd106da29c47390c9d834b420 Merge: 0119a3c 092dbbf Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 18 13:33:50 2015 +0000 Merge branch 'bug14919' Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 5 +---- Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 5 +---- Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 5 +---- gitian/descriptors/linux/gitian-pluggable-transports.yml | 12 ------------ gitian/descriptors/mac/gitian-pluggable-transports.yml | 12 ------------ gitian/descriptors/windows/gitian-pluggable-transports.yml | 12 ------------ gitian/fetch-inputs.sh | 5 ++--- gitian/verify-tags.sh | 2 +- gitian/versions.alpha | 5 +---- gitian/versions.nightly | 3 --- 10 files changed, 7 insertions(+), 59 deletions(-)

1 0

[torbutton/master] Bug #5698: Use "Tor Browser" branding in "About Tor Browser" dialog
by gk＠torproject.org 18 Feb '15

18 Feb '15

commit 7fd169e56e60ff70254c2d60600fab88a03246da Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat Feb 14 16:58:44 2015 -0800 Bug #5698: Use "Tor Browser" branding in "About Tor Browser" dialog --- src/chrome.manifest | 1 + src/chrome/content/aboutDialog.xul | 56 ++++++++++++++++++++++++++++++++++ src/chrome/locale/en/aboutDialog.dtd | 19 ++++++++++++ src/chrome/skin/about-wordmark.png | Bin 0 -> 4609 bytes src/chrome/skin/aboutDialog.css | 34 +++++++++++++++++++++ src/chrome/skin/default256.png | Bin 0 -> 48898 bytes 6 files changed, 110 insertions(+) diff --git a/src/chrome.manifest b/src/chrome.manifest index 2ab3c8f..6ef50dc 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -8,6 +8,7 @@ resource torbutton ./ # browser branding override chrome://branding/locale/brand.dtd chrome://torbutton/locale/brand.dtd override chrome://branding/locale/brand.properties chrome://torbutton/locale/brand.properties +overlay chrome://browser/content/aboutDialog.xul chrome://torbutton/content/aboutDialog.xul locale torbutton af chrome/locale/af/ locale torbutton ak chrome/locale/ak/ diff --git a/src/chrome/content/aboutDialog.xul b/src/chrome/content/aboutDialog.xul new file mode 100644 index 0000000..5b89a81 --- /dev/null +++ b/src/chrome/content/aboutDialog.xul @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?>  +<?xml-stylesheet href="chrome://torbutton/skin/aboutDialog.css" type="text/css"?> + +<!DOCTYPE window [ +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > +%brandDTD; +<!ENTITY % aboutDialogDTD SYSTEM "chrome://torbutton/locale/aboutDialog.dtd" > +%aboutDialogDTD; +]> + +<overlay id="main-overlay" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> + <vbox id="rightBox"> + <vbox id="detailsBox"> + <description class="text-blurb" id="projectDesc"> + &project.start; + <label class="text-link" + href="https://www.torproject.org/"> + &project.tpoLink; + </label>&project.end; + </description> + <description class="text-blurb" id="helpDesc"> + &help.start; + <label class="text-link" + href="https://www.torproject.org/donate/donate.html.en"> + &help.donateLink; + </label> + &help.or; + <label class="text-link" + href="https://www.torproject.org/getinvolved/volunteer.html.en"> + &help.getInvolvedLink; + </label>&help.end; + </description> + </vbox> + </vbox> + + <vbox id="bottomBox"> + <hbox id="newBottom" pack="center" position="1"> + <label class="text-link bottom-link" + href="https://www.torproject.org/docs/faq.html.en"> + &bottomLinks.questions; + </label> + <label class="text-link bottom-link" + href="https://www.torproject.org/getinvolved/relays"> + &bottomLinks.grow; + </label> + <label class="text-link bottom-link" + href="about:license"> + &bottomLinks.license; + </label> + </hbox> + <description id="trademarkTor" insertafter="trademark"> + &tor.TrademarkStatement; + </description> + </vbox> +</overlay> diff --git a/src/chrome/locale/en/aboutDialog.dtd b/src/chrome/locale/en/aboutDialog.dtd new file mode 100644 index 0000000..844f4e0 --- /dev/null +++ b/src/chrome/locale/en/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; is developed by "> + +<!ENTITY project.tpoLink "the &vendorShortName;"> +<!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> + +<!ENTITY help.start "Want to help? "> + +<!ENTITY help.donateLink "Donate"> +<!ENTITY help.or " or "> + +<!ENTITY help.getInvolvedLink "get involved"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Questions?"> + +<!ENTITY bottomLinks.grow "Help the Tor Network Grow!"> + +<!ENTITY bottomLinks.license "Licensing Information"> +<!ENTITY tor.TrademarkStatement "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc."> diff --git a/src/chrome/skin/about-wordmark.png b/src/chrome/skin/about-wordmark.png new file mode 100644 index 0000000..1becd87 Binary files /dev/null and b/src/chrome/skin/about-wordmark.png differ diff --git a/src/chrome/skin/aboutDialog.css b/src/chrome/skin/aboutDialog.css new file mode 100644 index 0000000..89eff53 --- /dev/null +++ b/src/chrome/skin/aboutDialog.css @@ -0,0 +1,34 @@ +#leftBox { + background-image: url('chrome://torbutton/skin/default256.png'); + background-position: right top; + background-size: 180px; +} + +#rightBox { + background-image: url('chrome://torbutton/skin/about-wordmark.png'); + background-position: left top; +} + +#contributeDesc { + display: none; +} + +#communityDesc { + display: none; +} + +#trademark { + display: none; +} + +#trademarkTor { + font-size: xx-small; + text-align: center; + color: #999999; + margin-top: 10px; + margin-bottom: 10px; +} + +#bottomBox > hbox:not(#newBottom) { + display: none; +} diff --git a/src/chrome/skin/default256.png b/src/chrome/skin/default256.png new file mode 100644 index 0000000..3d440fb Binary files /dev/null and b/src/chrome/skin/default256.png differ

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] fixup! Bug #4234: Use the Firefox Update Process for TBB.
by gk＠torproject.org 18 Feb '15

18 Feb '15

commit 25646ee4fcc9e6b910a1441616d744089a57dac5 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 18 11:22:33 2015 +0000 fixup! Bug #4234: Use the Firefox Update Process for TBB. Small indentation fix. --- browser/base/content/aboutDialog.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js index ba856d1..0a6ab8b 100644 --- a/browser/base/content/aboutDialog.js +++ b/browser/base/content/aboutDialog.js @@ -55,7 +55,8 @@ function init(aEvent) let versionElem = document.getElementById("version"); if (versionElem) versionElem.textContent = TOR_BROWSER_VERSION + - " (based on Mozilla Firefox " + versionElem.textContent + ")"; + " (based on Mozilla Firefox " + + versionElem.textContent + ")"; #endif #ifdef MOZ_UPDATER

1 0