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

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

16 Apr '15

commit 1a6eb58a1d3cab67e371ac861d04ba526d4e6751 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 14 10:31:39 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. We remove the keep-alive restriction now that we have isolation to the URL bar domain which is governing this as well (see: bug 4100). --- browser/app/profile/000-tor-browser.js | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/… [View More]

1 0

[tor-launcher/master] Merge branch 'bug13576-01'
by gk＠torproject.org 15 Apr '15

15 Apr '15

commit a37371ac9a866612e91a791251104184caad41ca Merge: b48d563 78f505c Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 15 20:01:36 2015 +0000 Merge branch 'bug13576-01' src/chrome/content/network-settings-overlay.xul | 5 ++--- src/chrome/content/network-settings.js | 13 +++++-------- src/chrome/skin/network-settings.css | 10 ++++++++-- 3 files changed, 15 insertions(+), 13 deletions(-)

1 0

[tor-launcher/master] Bug 13576: Tor Launcher strips "bridge" from the middle of bridge lines
by gk＠torproject.org 15 Apr '15

15 Apr '15

commit 78f505c2139341e71538e77a975f7df9f81189d0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Mar 26 14:42:20 2015 -0400 Bug 13576: Tor Launcher strips "bridge" from the middle of bridge lines Change the code that strips "bridge" to work on a line-by-line basis. Do not add a "bridge " prefix when displaying bridge configuration lines. To reduce user confusion, turn off word wrap for the custom bridge textbox. Improve alignment within bridge settings … [View More]UI. Windows: Increase width of Tor Network Settings wizard slightly so it is more likely that a bridge line with a fingerprint will fit. Mac OS: Use a slightly smaller font within the custom bridge textbox. --- src/chrome/content/network-settings-overlay.xul | 5 ++--- src/chrome/content/network-settings.js | 13 +++++-------- src/chrome/skin/network-settings.css | 10 ++++++++-- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index 03171ec..af9ddf9 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -79,8 +79,7 @@ oncommand="onBridgeTypeRadioChange()"> <radio id="bridgeRadioDefault" label="&torsettings.useBridges.default;" selected="true" /> - <hbox align="baseline" style="margin-top: -5px"> - <spacer style="width: 1.9em" /> + <hbox id="bridgeDefaultEntry" align="baseline" style="margin-top: -5px"> <label id="defaultBridgeTypeLabel" value="&torsettings.useBridges.type;" control="defaultBridgeType"/> @@ -99,7 +98,7 @@ <vbox id="bridgeCustomEntry"> <label id="bridgeListLabel" style="margin-top:0px;" value="&torsettings.useBridges.label;" control="bridgeList"/> - <textbox id="bridgeList" multiline="true" rows="3" + <textbox id="bridgeList" multiline="true" rows="3" wrap="off" oninput="onCustomBridgesTextInput();" placeholder="&torsettings.useBridges.placeholder;" /> </vbox> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 3277553..e4ebeaa 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -69,6 +69,8 @@ function initDialog() var isWindows = TorLauncherUtil.isWindows; if (isWindows) document.documentElement.setAttribute("class", "os-windows"); + else if (TorLauncherUtil.isMac) + document.documentElement.setAttribute("class", "os-mac"); var forAssistance = document.getElementById("forAssistance"); if (forAssistance) @@ -1305,7 +1307,6 @@ function parseAndValidateBridges(aStr) return null; var resultStr = aStr; - resultStr = resultStr.replace(/bridge/gi, ""); // Remove "bridge" everywhere. resultStr = resultStr.replace(/\r\n/g, "\n"); // Convert \r\n pairs into \n. resultStr = resultStr.replace(/\r/g, "\n"); // Convert \r into \n. resultStr = resultStr.replace(/\n\n/g, "\n"); // Condense blank lines. @@ -1314,7 +1315,8 @@ function parseAndValidateBridges(aStr) var tmpArray = resultStr.split('\n'); for (var i = 0; i < tmpArray.length; i++) { - let s = tmpArray[i].trim(); // Remove extraneous whitespace. + let s = tmpArray[i].trim(); // Remove extraneous white space. + s = s.replace(/^bridge\s+/i, ""); // Remove "bridge " from start of line. resultArray.push(s); } @@ -1397,8 +1399,7 @@ function setElemValue(aID, aValue) // Returns true if one or more values were set. function setBridgeListElemValue(aBridgeArray) { - // To be consistent with bridges.torproject.org, pre-pend "bridge" to - // each line as it is displayed in the UI. + // Trim white space and only keep non-empty values. var bridgeList = []; if (aBridgeArray) { @@ -1406,11 +1407,7 @@ function setBridgeListElemValue(aBridgeArray) { var s = aBridgeArray[i].trim(); if (s.length > 0) - { - if (s.toLowerCase().indexOf("bridge") != 0) - s = "bridge " + s; bridgeList.push(s); - } } } diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 331ae42..646baa6 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -24,7 +24,7 @@ wizard { } wizard.os-windows { - width: 46em; + width: 49em; height: 41em; } @@ -99,8 +99,14 @@ wizard[tor_hide_browser_logo="true"] .tbb-logo-separator { display: none; } +#bridgeDefaultEntry, #bridgeCustomEntry { - margin-left: 30px; + margin-left: 1.8em; +} + +dialog.os-mac #bridgeList, +wizard.os-mac #bridgeList { + font-size: 90%; } wizardpage[pageid="startingTor"] description, [View Less]

1 0

[tor-browser-bundle/master] Bug 15670: add support for the no_update_for option in config.yml
by gk＠torproject.org 15 Apr '15

15 Apr '15

commit 7d7faa30b4443f0cc76474738a36fd3f45e875f4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 13 19:53:11 2015 +0200 Bug 15670: add support for the no_update_for option in config.yml --- tools/update-responses/update_responses | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 07efc7c..6c497ef 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-… [View More]

1 0

[tor-launcher/master] Bug 15657: display host:port if HOSTADDR is provided by Tor.
by gk＠torproject.org 15 Apr '15

15 Apr '15

commit b48d563eaa58b2c423b1eba09aa712787ba5a559 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Apr 10 18:00:23 2015 -0400 Bug 15657: display host:port if HOSTADDR is provided by Tor. If a Tor bootstrap status message contains a HOSTADDR value, include it within the error alert that we display. Also fix a problem where the progress dialog stayed open after an error occurred (even though an error alert was displayed as soon as the user clicked the "… [View More]Cancel" button). --- src/chrome/content/progress.js | 13 ++++++++++--- src/components/tl-process.js | 7 ++++--- src/components/tl-protocol.js | 3 ++- src/modules/tl-util.jsm | 5 ++++- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/chrome/content/progress.js b/src/chrome/content/progress.js index 30c4370..8208398 100644 --- a/src/chrome/content/progress.js +++ b/src/chrome/content/progress.js @@ -1,4 +1,4 @@ -// Copyright (c) 2014, The Tor Project, Inc. +// Copyright (c) 2015, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -9,6 +9,7 @@ const Cu = Components.utils; const kTorProcessExitedTopic = "TorProcessExited"; const kBootstrapStatusTopic = "TorBootstrapStatus"; +const kTorBootstrapErrorTopic = "TorBootstrapError"; const kTorLogHasWarnOrErrTopic = "TorLogHasWarnOrErr"; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); @@ -42,6 +43,7 @@ function initDialog() .getService(Ci.nsIObserverService); gObsSvc.addObserver(gObserver, kTorProcessExitedTopic, false); gObsSvc.addObserver(gObserver, kBootstrapStatusTopic, false); + gObsSvc.addObserver(gObserver, kTorBootstrapErrorTopic, false); gObsSvc.addObserver(gObserver, kTorLogHasWarnOrErrTopic, false); } catch (e) {} @@ -85,6 +87,7 @@ function cleanup() { gObsSvc.removeObserver(gObserver, kTorProcessExitedTopic); gObsSvc.removeObserver(gObserver, kBootstrapStatusTopic); + gObsSvc.removeObserver(gObserver, kTorBootstrapErrorTopic); gObsSvc.removeObserver(gObserver, kTorLogHasWarnOrErrTopic); } } @@ -132,10 +135,14 @@ var gObserver = { // nsIObserver implementation. observe: function(aSubject, aTopic, aParam) { - if (kTorProcessExitedTopic == aTopic) + if ((kTorProcessExitedTopic == aTopic) || + (kTorBootstrapErrorTopic == aTopic)) { + // In these cases, an error alert will be displayed elsewhere so it is + // best to close this window. // TODO: provide a way to access tor log e.g., leave this dialog open - // and display the open settings button. + // and display the open settings button or provide a way to do + // that from our error alerts. cleanup(); window.close(); } diff --git a/src/components/tl-process.js b/src/components/tl-process.js index b6dc98f..ef2b12c 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -1,4 +1,4 @@ -// Copyright (c) 2014, The Tor Project, Inc. +// Copyright (c) 2015, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -524,10 +524,11 @@ TorProcessService.prototype = this.mLastTorWarningPhase = aStatusObj.TAG; this.mLastTorWarningReason = aStatusObj.REASON; + // Notify others that an error will be displayed. + this.mObsSvc.notifyObservers(null, "TorBootstrapError", reason); + var msg = TorLauncherUtil.getLocalizedString("tor_bootstrap_failed"); TorLauncherUtil.showAlert(null, msg + "\n\n" + details); - - this.mObsSvc.notifyObservers(null, "TorBootstrapError", reason); } } } diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index 09ec468..559bb37 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -1,4 +1,4 @@ -// Copyright (c) 2014, The Tor Project, Inc. +// Copyright (c) 2015, The Tor Project, Inc. // See LICENSE for licensing information. // TODO: Some code came from torbutton.js (pull in copyright and license?) // @@ -310,6 +310,7 @@ TorProtocolService.prototype = // status.REASON -- string (optional) // status.COUNT -- integer (optional) // status.RECOMMENDATION -- string (optional) + // status.HOSTADDR -- string (optional) // A "TorBootstrapStatus" notification is also sent. // Returns null upon failure. _parseBootstrapStatus: function(aStatusMsg) diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 834d260..ac680a8 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -1,4 +1,4 @@ -// Copyright (c) 2014, The Tor Project, Inc. +// Copyright (c) 2015, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -182,6 +182,9 @@ let TorLauncherUtil = // Public if (!result) result = fallbackStr; + if ((aKeyword == "REASON") && aStatusObj.HOSTADDR) + result += " - " + aStatusObj.HOSTADDR; + return (result) ? result : ""; }, [View Less]

1 0

[tor-browser-bundle/master] Update meek to 0.17.
by gk＠torproject.org 10 Apr '15

10 Apr '15

commit 25dc8d416325f01ca046a70afc115e57c37c7b43 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 5 23:36:27 2015 +0000 Update meek to 0.17. Removes --exit-on-stdin-eof from meek-client-torbrowser command; now handled by the TOR_PT_EXIT_ON_STDIN_CLOSE environment variable. --- Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 2 +- gitian/versions | 2 +- gitian/versions.alpha … [View More] | 2 +- gitian/versions.beta | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index f287e3e..ad1eb07 100644 --- a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -12,4 +12,4 @@ ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\Pluggab ClientTransportPlugin flashproxy exec TorBrowser\Tor\PluggableTransports\flashproxy-client --register :0 :9000 ## meek configuration -ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer TorBrowser\Tor\PluggableTransports\meek-client-torbrowser --exit-on-stdin-eof -- TorBrowser\Tor\PluggableTransports\meek-client +ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer TorBrowser\Tor\PluggableTransports\meek-client-torbrowser -- TorBrowser\Tor\PluggableTransports\meek-client diff --git a/gitian/versions b/gitian/versions index 4b0c9a4..a2f7817 100755 --- a/gitian/versions +++ b/gitian/versions @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.16 +MEEK_TAG=0.17 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GITIAN_TAG=tor-browser-builder-3.x-7 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 6976ea8..ee69d08 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.16 +MEEK_TAG=0.17 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd diff --git a/gitian/versions.beta b/gitian/versions.beta index efb4bfb..673b2e5 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.16 +MEEK_TAG=0.17 GITIAN_TAG=tor-browser-builder-3.x-6 [View Less]

1 0

[torbutton/master] Bug #15651: Restore deleted line in comment
by gk＠torproject.org 10 Apr '15

10 Apr '15

commit 1b2b3ee19651a18141563ce3d4b69a9f506689fb Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Apr 10 05:53:16 2015 +0100 Bug #15651: Restore deleted line in comment The deletion occured in c48bf013150c6a5cd0bfc17cf219615824208f44 --- src/chrome/content/torbutton.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 7d6486f..b4b3ab5 100644 --- a/src/chrome/content/torbutton.js +++… [View More]

1 0

[tor-browser-bundle/maint-4.0] 4.0.8 will be incremental from 4.0.6 only, since 4.0.7 thinks its 4.0.6.
by mikeperry＠torproject.org 08 Apr '15

08 Apr '15

commit d4e10e98af5237ed21796a4d48c3e09db6994959 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 8 11:27:06 2015 -0700 4.0.8 will be incremental from 4.0.6 only, since 4.0.7 thinks its 4.0.6. --- tools/update-responses/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 7d5c391..3470616 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-… [View More]

1 0

[tor-browser-bundle/maint-4.0] Update changelog and versions for 4.0.8.
by mikeperry＠torproject.org 08 Apr '15

08 Apr '15

commit 41f93db41d60f7ecc036e9916c9af1dbcda7c7d5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 8 11:18:31 2015 -0700 Update changelog and versions for 4.0.8. --- Bundle-Data/Docs/ChangeLog.txt | 4 ++++ gitian/versions | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c0630a0..9df5a76 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/… [View More]

1 0

[tor-browser-bundle/maint-4.0] Update NoScript once again.
by mikeperry＠torproject.org 07 Apr '15

07 Apr '15

commit 9edd486bd6f83fdbd2fd7a43966ccabd39a0a552 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 7 14:17:36 2015 -0700 Update NoScript once again. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index eb89707..c0630a0 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @… [View More]

1 0