tbb-commits August 2014

tbb-commits@lists.torproject.org

3 participants
290 discussions

[torbutton/master] Bug 12684: Slightly tweak the canvas message.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit 402eb5d24ba35aef68ecbe95d77fa3c5c0768d29 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Aug 19 20:52:21 2014 -0700 Bug 12684: Slightly tweak the canvas message. Still not perfect, but repeating "image data" and "extract" twice might help get the point across. --- src/chrome/locale/en/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index c04b1e8..c76be32 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -48,7 +48,7 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an torbutton.popup.never_ask_again = Never ask me again # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to access HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to access HTML5 canvases? +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.notNow=Not Now canvas.notNowAccessKey=N canvas.allow=Allow in the future

1 0

[torbutton/master] Bug #12684: Add `canvas.notNow` UI strings to torbutton.properties file.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit b0d3f1879bf6b3bb61499c8178155729457856a5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jul 29 06:18:10 2014 +0000 Bug #12684: Add `canvas.notNow` UI strings to torbutton.properties file. Also, clarify UI strings which explain HTML5 canvas fingerprinting and options within the PopupNotification dialogue, and make capitalisation consistent. * FIXES #12684. [0] [0]: https://bugs.torproject.org/12684 --- src/chrome/locale/en/torbutton.properties | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index d34432d..c04b1e8 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an torbutton.popup.never_ask_again = Never ask me again # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time. -canvas.allow=Allow in the Future +canvas.siteprompt=This website (%S) attempted to access HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to access HTML5 canvases? +canvas.notNow=Not Now +canvas.notNowAccessKey=N +canvas.allow=Allow in the future canvas.allowAccessKey=A -canvas.never=Never for This Site +canvas.never=Never for this site (recommended) canvas.neverAccessKey=e

1 0

[tor-launcher/master] Do not show copy log button when help is open.
by brade＠torproject.org 19 Aug '14

19 Aug '14

commit fb7e0576942310ff262165ecf6cf7c2bf2ed48bd Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 19 11:10:07 2014 -0400 Do not show copy log button when help is open. If a Tor error or warning message arrived while the Bridge Help was open, the "Copy Tor Log To Clipboard" button was shown immediately (instead of after the help was closed). --- src/chrome/content/network-settings.js | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 0e84f92..5f3f698 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -439,10 +439,7 @@ function showPanel(aPanelID) var deckElem = document.getElementById("deck"); if (deckElem) - { deckElem.selectedPanel = document.getElementById(aPanelID); - showOrHideButton("extra2", (aPanelID != "bridgeHelp"), false); - } else if (wizard.currentPage.pageid != aPanelID) wizard.goTo(aPanelID); @@ -527,17 +524,19 @@ function showErrorMessage(aTorExited, aErrorMsg) function showCopyLogButton(aHaveErrorOrWarning) { - var copyLogBtn = document.documentElement.getButton("extra2"); + let copyLogBtn = document.documentElement.getButton("extra2"); if (copyLogBtn) { - if (getWizard()) + let haveWizard = (getWizard() != null); + if (haveWizard) copyLogBtn.setAttribute("wizardCanCopyLog", true); - copyLogBtn.removeAttribute("hidden"); + if (!gRestoreAfterHelpPanelID) + copyLogBtn.removeAttribute("hidden"); // Show button if help is not open. if (aHaveErrorOrWarning) { - var clz = copyLogBtn.getAttribute("class"); + let clz = copyLogBtn.getAttribute("class"); if (!clz) copyLogBtn.setAttribute("class", "torWarning"); else if (clz.indexOf("torWarning") < 0) @@ -549,14 +548,12 @@ function showCopyLogButton(aHaveErrorOrWarning) function restoreCopyLogVisibility() { - if (!getWizard()) - return; - - var copyLogBtn = document.documentElement.getButton("extra2"); + let copyLogBtn = document.documentElement.getButton("extra2"); if (!copyLogBtn) return; - if (copyLogBtn.hasAttribute("wizardCanCopyLog")) + // Always show button in non-wizard case; conditionally in wizard. + if (!getWizard() || copyLogBtn.hasAttribute("wizardCanCopyLog")) copyLogBtn.removeAttribute("hidden"); else copyLogBtn.setAttribute("hidden", true); @@ -735,11 +732,12 @@ function onOpenHelp() showPanel("bridgeHelp"); + showOrHideButton("extra2", false, false); // Hide "Copy Tor Log To Clipboard" + if (getWizard()) { showOrHideButton("cancel", false, false); showOrHideButton("back", false, false); - showOrHideButton("extra2", false, false); overrideButtonLabel("next", "done"); var forAssistance = document.getElementById("forAssistance"); if (forAssistance) @@ -755,11 +753,12 @@ function closeHelp() if (!gRestoreAfterHelpPanelID) // Already closed? return; + restoreCopyLogVisibility(); + if (getWizard()) { showOrHideButton("cancel", true, false); showOrHideButton("back", true, false); - restoreCopyLogVisibility(); restoreButtonLabel("next"); var forAssistance = document.getElementById("forAssistance"); if (forAssistance)

1 0

[tor-launcher/master] Bug 11199 fixup: Improve behavior if tor exits.
by brade＠torproject.org 14 Aug '14

14 Aug '14

commit 3aa4860244adf99ba09911708ba8faa05a6cfa14 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 14 16:37:53 2014 -0400 Bug 11199 fixup: Improve behavior if tor exits. Improved alert/error messages and button labels. --- src/chrome/content/network-settings-wizard.xul | 2 +- src/chrome/content/network-settings.js | 7 ++++++- src/chrome/content/network-settings.xul | 2 +- src/chrome/locale/en/torlauncher.properties | 6 +++--- src/chrome/skin/network-settings.css | 1 + src/components/tl-process.js | 18 ++++++++++++++---- src/modules/tl-util.jsm | 8 +++++--- 7 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 6a3b8fc..70d1bcf 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -168,7 +168,7 @@ <spring flex="1" /> <hbox> <spring flex="1" /> - <description id="errorPanelMessage" /> + <description id="errorPanelMessage" flex="1" /> <spring flex="1" /> </hbox> <separator/> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index fdd565e..0e84f92 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -491,15 +491,20 @@ function showErrorMessage(aTorExited, aErrorMsg) if (aTorExited) { // Show "Tor exited" message and "Restart Tor" button. - aErrorMsg = TorLauncherUtil.getLocalizedString("tor_exited"); + aErrorMsg = TorLauncherUtil.getLocalizedString("tor_exited") + + "\n\n" + TorLauncherUtil.getLocalizedString("tor_exited2"); if (btn) btn.removeAttribute("hidden"); + if (elem) + elem.style.textAlign = "start"; } else { if (btn) btn.setAttribute("hidden", true); + if (elem) + elem.style.textAlign = "center"; } if (elem) diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index 937db71..a81a5f0 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -67,7 +67,7 @@ <spring flex="1" /> <hbox> <spring flex="1" /> - <description id="errorPanelMessage" /> + <description id="errorPanelMessage" flex="1" /> <spring flex="1" /> </hbox> <separator/> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index bf2426a..816d831 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Tor Launcher -torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. +torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. +torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -30,7 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect -torlauncher.reconnect=Reconnect +torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index a823914..03f84d7 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -105,6 +105,7 @@ wizardpage[pageid="errorPanel"] description, font-size: 120%; font-weight: bold; white-space: pre-wrap; + text-align: center; } #restartButton { diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 619a32c..cc5d654 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -148,11 +148,21 @@ TorProcessService.prototype = { this.mProtocolSvc.TorCleanupConnection(); - var s = TorLauncherUtil.getLocalizedString("tor_exited"); + var s = TorLauncherUtil.getLocalizedString("tor_exited") + "\n\n" + + TorLauncherUtil.getLocalizedString("tor_exited2"); TorLauncherLogger.log(4, s); - s += "\n" + TorLauncherUtil.getLocalizedString("tor_connection_lost"); - var btnLabel = TorLauncherUtil.getLocalizedString("reconnect"); - if (TorLauncherUtil.showConfirm(null, s, btnLabel) && !this.mIsQuitting) + var defaultBtnLabel = TorLauncherUtil.getLocalizedString("restart_tor"); + var cancelBtnLabel = "OK"; + try + { + const kSysBundleURI = "chrome://global/locale/commonDialogs.properties"; + var sysBundle = Cc["@mozilla.org/intl/stringbundle;1"] + .getService(Ci.nsIStringBundleService).createBundle(kSysBundleURI); + cancelBtnLabel = sysBundle.GetStringFromName(cancelBtnLabel); + } catch(e) {} + + if (TorLauncherUtil.showConfirm(null, s, defaultBtnLabel, cancelBtnLabel) + && !this.mIsQuitting) { this._startTor(); this._controlTor(); diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 1b8c809..834d260 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -64,7 +64,8 @@ let TorLauncherUtil = // Public // Returns true if user confirms; false if not. // Note that no prompt is shown (and false is returned) if the Network Settings // window is open. - showConfirm: function(aParentWindow, aMsg, aOKButtonLabel) + showConfirm: function(aParentWindow, aMsg, aDefaultButtonLabel, + aCancelButtonLabel) { try { @@ -84,11 +85,12 @@ let TorLauncherUtil = // Public var title = this.getLocalizedString("error_title"); var btnFlags = (ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING) + ps.BUTTON_POS_0_DEFAULT - + (ps.BUTTON_POS_1 * ps.BUTTON_TITLE_CANCEL); + + (ps.BUTTON_POS_1 * ps.BUTTON_TITLE_IS_STRING); var notUsed = { value: false }; var btnIndex = ps.confirmEx(aParentWindow, title, aMsg, btnFlags, - aOKButtonLabel, null, null, null, notUsed); + aDefaultButtonLabel, aCancelButtonLabel, + null, null, notUsed); return (0 == btnIndex); } catch (e)

1 0

[tor-launcher/master] Remove all observers when dialogs are closed.
by brade＠torproject.org 07 Aug '14

07 Aug '14

commit 9c0ef4f67d5ec18e17e8a3e789a198819c90c7ce Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 7 14:14:57 2014 -0400 Remove all observers when dialogs are closed. --- src/chrome/content/network-settings-wizard.xul | 3 +- src/chrome/content/network-settings.js | 64 +++++++++++++++++++----- src/chrome/content/network-settings.xul | 3 +- 3 files changed, 56 insertions(+), 14 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index da81ced..6a3b8fc 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -21,7 +21,8 @@ buttonlabelextra2="&torsettings.copyLog;" onwizardfinish="return applySettings();" onwizardcancel="return onCancel();" - onload="initDialog();"> + onload="initDialog();" + onunload="deinitDialog();"> <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index bdfb5c1..fdd565e 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -62,6 +62,7 @@ var gObsService = null; var gIsInitialBootstrap = false; var gIsBootstrapComplete = false; var gRestoreAfterHelpPanelID = null; +var gActiveTopics = []; // Topics for which an observer is currently installed. function initDialog() @@ -156,10 +157,10 @@ function initDialog() initDefaultBridgeTypeMenu(); - gObsService.addObserver(gObserver, kTorBootstrapErrorTopic, false); - gObsService.addObserver(gObserver, kTorLogHasWarnOrErrTopic, false); - gObsService.addObserver(gObserver, kTorProcessExitedTopic, false); - gObsService.addObserver(gObserver, kTorOpenProgressTopic, false); + addObserver(kTorBootstrapErrorTopic); + addObserver(kTorLogHasWarnOrErrTopic); + addObserver(kTorProcessExitedTopic); + addObserver(kTorOpenProgressTopic); var status = gTorProcessService.TorProcessStatus; if (TorLauncherUtil.shouldStartAndOwnTor && @@ -169,8 +170,8 @@ function initDialog() showErrorMessage(true, null); else showStartingTorPanel(); - gObsService.addObserver(gObserver, kTorProcessReadyTopic, false); - gObsService.addObserver(gObserver, kTorProcessDidNotStartTopic, false); + addObserver(kTorProcessReadyTopic); + addObserver(kTorProcessDidNotStartTopic); } else { @@ -199,6 +200,12 @@ function initDialog() } +function deinitDialog() +{ + removeAllObservers(); +} + + // For now, we assume that the wizard buttons are the widest portion. // TODO: return a value for the settings dialog (non-wizard case). function maxWidthOfContent() @@ -329,7 +336,8 @@ var gObserver = { if (kTorProcessReadyTopic == aTopic) { - gObsService.removeObserver(gObserver, kTorProcessReadyTopic); + removeObserver(kTorProcessReadyTopic); + removeObserver(kTorProcessDidNotStartTopic); var haveWizard = (getWizard() != null); showPanel(); if (haveWizard) @@ -341,12 +349,13 @@ var gObserver = { } else if (kTorProcessDidNotStartTopic == aTopic) { - gObsService.removeObserver(gObserver, kTorProcessDidNotStartTopic); + removeObserver(kTorProcessReadyTopic); + removeObserver(kTorProcessDidNotStartTopic); showErrorMessage(false, aData); } else if (kTorProcessExitedTopic == aTopic) { - gObsService.removeObserver(gObserver, kTorProcessExitedTopic); + removeObserver(kTorProcessExitedTopic); showErrorMessage(true, null); } else if (kTorOpenProgressTopic == aTopic) @@ -357,6 +366,37 @@ var gObserver = { }; +// addObserver() will not add two observers for the same topic. +function addObserver(aTopic) +{ + if (gActiveTopics.indexOf(aTopic) < 0) + { + gObsService.addObserver(gObserver, aTopic, false); + gActiveTopics.push(aTopic); + } +} + + +function removeObserver(aTopic) +{ + let idx = gActiveTopics.indexOf(aTopic); + if (idx >= 0) + { + gObsService.removeObserver(gObserver, aTopic); + gActiveTopics.splice(idx, 1); + } +} + + +function removeAllObservers() +{ + for (let i = gActiveTopics.length - 1; i >= 0; --i) + gObsService.removeObserver(gObserver, gActiveTopics[i]); + + gActiveTopics = []; +} + + function readTorSettings() { TorLauncherLogger.log(2, "readTorSettings " + @@ -641,9 +681,9 @@ function onProxyTypeChange() function onRestartTor() { // Re-add these observers in case they have been removed. - gObsService.addObserver(gObserver, kTorProcessReadyTopic, false); - gObsService.addObserver(gObserver, kTorProcessDidNotStartTopic, false); - gObsService.addObserver(gObserver, kTorProcessExitedTopic, false); + addObserver(kTorProcessReadyTopic); + addObserver(kTorProcessDidNotStartTopic); + addObserver(kTorProcessExitedTopic); gTorProcessService._startTor(); gTorProcessService._controlTor(); diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index 1fcd4a7..937db71 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -24,7 +24,8 @@ ondialogcancel="return onCancel();" ondialogextra2="onCopyLog();" ondialoghelp="onOpenHelp();" - onload="initDialog();"> + onload="initDialog();" + onunload="deinitDialog();"> <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/>

1 0

[tor-browser-bundle/maint-3.6] Frodo Baggins can now sign OpenSSL releases, apparently.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit cc6a688a1e8b5c1501ecb5f9838683e833153747 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 16:34:28 2014 -0700 Frodo Baggins can now sign OpenSSL releases, apparently. --- gitian/gpg/OPENSSL.gpg | Bin 6924 -> 8467 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/OPENSSL.gpg b/gitian/gpg/OPENSSL.gpg index d8c115b..da395de 100644 Binary files a/gitian/gpg/OPENSSL.gpg and b/gitian/gpg/OPENSSL.gpg differ

1 0

[tor-browser-bundle/master] Frodo Baggins can now sign OpenSSL releases, apparently.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit 24bc2eea8666da86c524b321c9889e9b96f6be7e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 16:33:23 2014 -0700 Frodo Baggins can now sign OpenSSL releases, apparently. --- gitian/gpg/OPENSSL.gpg | Bin 6924 -> 8467 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/OPENSSL.gpg b/gitian/gpg/OPENSSL.gpg index d8c115b..da395de 100644 Binary files a/gitian/gpg/OPENSSL.gpg and b/gitian/gpg/OPENSSL.gpg differ

1 0

[tor-browser-bundle/master] Update main Changelog with newer 3.6.4 material.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit 4426a4daed68c08d4582b8b713b0dd3bdf397b82 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 16:06:37 2014 -0700 Update main Changelog with newer 3.6.4 material. --- Bundle-Data/Docs/ChangeLog.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 9626ceb..8eb4284 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser Bundle 4.0-alpha-1 -- Aug 7 2014 +Tor Browser Bundle 4.0-alpha-1 -- Aug 8 2014 * All Platforms * Ticket 10935: Include the Meek Pluggable Transport (version 0.10) * Two modes of Meek are provided: Meek over Google and Meek over Amazon @@ -31,10 +31,15 @@ Tor Browser Bundle 4.0-alpha-1 -- Aug 7 2014 * Bug 11102: Set Window Class to "Tor Browser" to aid in Desktop navigation * Bug 12249: Don't create PT debug files anymore -Tor Browser Bundle 3.6.4 -- Aug 6 2014 +Tor Browser Bundle 3.6.4 -- Aug 8 2014 * All Platforms * Update Tor to 0.2.4.23 * Update Tor launcher to 0.2.5.6 + * Update OpenSSL to 1.0.1i + * Backported Tor Patches: + * Bug 11654: Properly apply the fix for malformed bug11156 log message + * Bug 11200: Fix a hang during bootstrap introduced in the initial + bug11200 patch. * Update NoScript to 2.6.8.36 * Bug 9516: Send Tor Launcher log messages to Browser Console * Update Torbutton to 1.6.11.1

1 0

[tor-browser-bundle/maint-3.6] Apply rebased Bug11200-hang fix.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit 91751b52e06a3fe5dd94eb4fa045ac75859d5842 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 16:04:17 2014 -0700 Apply rebased Bug11200-hang fix. --- Bundle-Data/Docs/ChangeLog.txt | 2 + gitian/descriptors/linux/gitian-tor.yml | 2 + gitian/descriptors/mac/gitian-tor.yml | 2 + gitian/descriptors/windows/gitian-tor.yml | 2 + gitian/patches/bug11200-hang-0.2.4.patch | 66 +++++++++++++++++++++++++++++ 5 files changed, 74 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index e986467..d0336d7 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -5,6 +5,8 @@ Tor Browser Bundle 3.6.4 -- Aug 8 2014 * Update OpenSSL to 1.0.1i * Backported Tor Patches: * Bug 11654: Properly apply the fix for malformed bug11156 log message + * Bug 11200: Fix a hang during bootstrap introduced in the initial + bug11200 patch. * Update NoScript to 2.6.8.36 * Bug 9516: Send Tor Launcher log messages to Browser Console * Update Torbutton to 1.6.11.1 diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 27e242b..fa1badb 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -30,6 +30,7 @@ files: - "bug9665.patch" - "bug8402.patch" - "bug8402-master.patch" +- "bug11200-hang-0.2.4.patch" - "dzip.sh" - "openssl-linux32-utils.zip" - "openssl-linux64-utils.zip" @@ -80,6 +81,7 @@ script: | git am ~/build/bug9665.patch git am ~/build/bug11200.patch git am ~/build/bug8402.patch + git am ~/build/bug11200-hang-0.2.4.patch else git am ~/build/bug8402-master.patch fi diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 054e1a8..5e1ea0f 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -26,6 +26,7 @@ files: - "bug11069.patch" - "bug9665.patch" - "bug8402.patch" +- "bug11200-hang-0.2.4.patch" - "bug8402-master.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" @@ -76,6 +77,7 @@ script: | git am ~/build/bug9665.patch git am ~/build/bug11200.patch git am ~/build/bug8402.patch + git am ~/build/bug11200-hang-0.2.4.patch else git am ~/build/bug8402-master.patch fi diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index aea69b9..7d244ae 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -28,6 +28,7 @@ files: - "bug9665.patch" - "bug8402.patch" - "bug8402-master.patch" +- "bug11200-hang-0.2.4.patch" - "binutils.tar.bz2" - "dzip.sh" - "binutils-win32-utils.zip" @@ -77,6 +78,7 @@ script: | git am ~/build/bug9665.patch git am ~/build/bug11200.patch git am ~/build/bug8402.patch + git am ~/build/bug11200-hang-0.2.4.patch else git am ~/build/bug8402-master.patch fi diff --git a/gitian/patches/bug11200-hang-0.2.4.patch b/gitian/patches/bug11200-hang-0.2.4.patch new file mode 100644 index 0000000..6bac5e4 --- /dev/null +++ b/gitian/patches/bug11200-hang-0.2.4.patch @@ -0,0 +1,66 @@ +From 813dc75f717cab1f7896c77e838c496daa3e4deb Mon Sep 17 00:00:00 2001 +From: Roger Dingledine <arma(a)torproject.org> +Date: Wed, 6 Aug 2014 15:57:24 -0700 +Subject: [PATCH] Build circuits more readily when DisableNetwork goes to 0 + +When Tor starts with DisabledNetwork set, it would correctly +conclude that it shouldn't try making circuits, but it would +mistakenly cache this conclusion and continue believing it even +when DisableNetwork is set to 0. Fixes the bug introduced by the +fix for bug 11200; bugfix on 0.2.5.4-alpha. +--- + src/or/nodelist.c | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +diff --git a/src/or/nodelist.c b/src/or/nodelist.c +index e814e16..18b6677 100644 +--- a/src/or/nodelist.c ++++ b/src/or/nodelist.c +@@ -1240,10 +1240,21 @@ static char dir_info_status[256] = ""; + int + router_have_minimum_dir_info(void) + { ++ static int logged_delay=0; ++ const char *delay_fetches_msg = NULL; ++ if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { ++ if (!logged_delay) ++ log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); ++ logged_delay=1; ++ strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); ++ return 0; ++ } ++ logged_delay = 0; /* reset it if we get this far */ ++ + if (PREDICT_UNLIKELY(need_to_update_have_min_dir_info)) { + update_router_have_minimum_dir_info(); +- need_to_update_have_min_dir_info = 0; + } ++ + return have_min_dir_info; + } + +@@ -1439,7 +1450,6 @@ update_router_have_minimum_dir_info(void) + const networkstatus_t *consensus = + networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); + int using_md; +- const char *delay_fetches_msg = NULL; + + if (!consensus) { + if (!networkstatus_get_latest_consensus()) +@@ -1452,13 +1462,6 @@ update_router_have_minimum_dir_info(void) + goto done; + } + +- if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { +- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); +- strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); +- res = 0; +- goto done; +- } +- + using_md = consensus->flavor == FLAV_MICRODESC; + + { +-- +1.9.1 +

1 0

[tor-browser-bundle/master] Replace bug11200 patch with squashed version.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit d624e24bd780a11c289168d88f703b885f25ff6c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 15:51:07 2014 -0700 Replace bug11200 patch with squashed version. --- gitian/patches/bug11200-hang-0.2.5.patch | 197 ++++-------------------------- 1 file changed, 21 insertions(+), 176 deletions(-) diff --git a/gitian/patches/bug11200-hang-0.2.5.patch b/gitian/patches/bug11200-hang-0.2.5.patch index a95afb2..76cd159 100644 --- a/gitian/patches/bug11200-hang-0.2.5.patch +++ b/gitian/patches/bug11200-hang-0.2.5.patch @@ -1,61 +1,7 @@ -From 2897735249dfe2de11b2f2e777aa35e1b1926329 Mon Sep 17 00:00:00 2001 +From fcac4b4467427e8f6ad948e8c8e6f34a0131e716 Mon Sep 17 00:00:00 2001 From: Roger Dingledine <arma(a)torproject.org> Date: Tue, 5 Aug 2014 16:54:46 -0400 -Subject: [PATCH 1/4] move the consensus check below the disablednetwork check - -should have no impact in practice ---- - src/or/nodelist.c | 20 +++++++++++--------- - 1 file changed, 11 insertions(+), 9 deletions(-) - -diff --git a/src/or/nodelist.c b/src/or/nodelist.c -index 8f87081..a33a8b2 100644 ---- a/src/or/nodelist.c -+++ b/src/or/nodelist.c -@@ -1495,11 +1495,20 @@ update_router_have_minimum_dir_info(void) - time_t now = time(NULL); - int res; - const or_options_t *options = get_options(); -- const networkstatus_t *consensus = -- networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); -+ const networkstatus_t *consensus; - int using_md; - const char *delay_fetches_msg = NULL; - -+ if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { -+ log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); -+ strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); -+ res = 0; -+ goto done; -+ } -+ -+ consensus = -+ networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); -+ - if (!consensus) { - if (!networkstatus_get_latest_consensus()) - strlcpy(dir_info_status, "We have no usable consensus.", -@@ -1511,13 +1520,6 @@ update_router_have_minimum_dir_info(void) - goto done; - } - -- if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { -- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); -- strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); -- res = 0; -- goto done; -- } -- - using_md = consensus->flavor == FLAV_MICRODESC; - - { --- -1.9.1 - -From 9c62f4677d49073332bfcdd2f8c61229c943fd22 Mon Sep 17 00:00:00 2001 -From: Roger Dingledine <arma(a)torproject.org> -Date: Tue, 5 Aug 2014 17:04:39 -0400 -Subject: [PATCH 2/4] Build circuits more readily when DisableNetwork goes to 0 +Subject: [PATCH] Build circuits more readily when DisableNetwork goes to 0 When Tor starts with DisabledNetwork set, it would correctly conclude that it shouldn't try making circuits, but it would @@ -64,8 +10,8 @@ when DisableNetwork is set to 0. Fixes the bug introduced by the fix for bug 11200; bugfix on 0.2.5.4-alpha. --- changes/bug11200-caching | 7 +++++++ - src/or/nodelist.c | 10 ++++++++-- - 2 files changed, 15 insertions(+), 2 deletions(-) + src/or/nodelist.c | 21 ++++++++++++--------- + 2 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 changes/bug11200-caching diff --git a/changes/bug11200-caching b/changes/bug11200-caching @@ -82,97 +28,10 @@ index 0000000..e3fbaec + fix for bug 11200; bugfix on 0.2.5.4-alpha. + diff --git a/src/or/nodelist.c b/src/or/nodelist.c -index a33a8b2..c863663 100644 +index 8f87081..7b1f338 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c -@@ -1494,16 +1494,21 @@ update_router_have_minimum_dir_info(void) - { - time_t now = time(NULL); - int res; -+ static int disabled=0; - const or_options_t *options = get_options(); - const networkstatus_t *consensus; - int using_md; - const char *delay_fetches_msg = NULL; - - if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { -- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); -+ if (!disabled) -+ log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); - strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); - res = 0; -+ disabled = 1; - goto done; -+ } else { -+ disabled = 0; - } - - consensus = -@@ -1568,6 +1573,7 @@ update_router_have_minimum_dir_info(void) - control_event_client_status(LOG_NOTICE, "NOT_ENOUGH_DIR_INFO"); - } - have_min_dir_info = res; -- need_to_update_have_min_dir_info = 0; -+ if (!disabled) -+ need_to_update_have_min_dir_info = 0; - } - --- -1.9.1 - -From a8f3a72027f35284b2115b078ef8a39c60e5f054 Mon Sep 17 00:00:00 2001 -From: Roger Dingledine <arma(a)torproject.org> -Date: Tue, 5 Aug 2014 17:33:33 -0400 -Subject: [PATCH 3/4] Stop redundant clearing of - need_to_update_have_min_dir_info - -We were clearing it in router_have_minimum_dir_info() as well as in -update_router_have_minimum_dir_info(). ---- - src/or/nodelist.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/or/nodelist.c b/src/or/nodelist.c -index c863663..6eb286f 100644 ---- a/src/or/nodelist.c -+++ b/src/or/nodelist.c -@@ -1277,7 +1277,6 @@ router_have_minimum_dir_info(void) - { - if (PREDICT_UNLIKELY(need_to_update_have_min_dir_info)) { - update_router_have_minimum_dir_info(); -- need_to_update_have_min_dir_info = 0; - } - return have_min_dir_info; - } -@@ -1488,7 +1487,7 @@ get_frac_paths_needed_for_circs(const or_options_t *options, - - /** Change the value of have_min_dir_info, setting it true iff we have enough - * network and router information to build circuits. Clear the value of -- * need_to_update_have_min_dir_info. */ -+ * need_to_update_have_min_dir_info if we're confident of our answer. */ - static void - update_router_have_minimum_dir_info(void) - { --- -1.9.1 - -From 3605a9bade91f78b139f4900830836d82abadf15 Mon Sep 17 00:00:00 2001 -From: Roger Dingledine <arma(a)torproject.org> -Date: Wed, 6 Aug 2014 02:11:52 -0400 -Subject: [PATCH 4/4] refactor DisableNetwork check - -Move the block from update_router_have_minimum_dir_info() to -router_have_minimum_dir_info() so it's clearer that it's not -actually updating the variable. ---- - src/or/nodelist.c | 34 +++++++++++++++------------------- - 1 file changed, 15 insertions(+), 19 deletions(-) - -diff --git a/src/or/nodelist.c b/src/or/nodelist.c -index 6eb286f..57b0bce 100644 ---- a/src/or/nodelist.c -+++ b/src/or/nodelist.c -@@ -1275,9 +1275,21 @@ static char dir_info_status[256] = ""; +@@ -1275,10 +1275,21 @@ static char dir_info_status[256] = ""; int router_have_minimum_dir_info(void) { @@ -189,48 +48,34 @@ index 6eb286f..57b0bce 100644 + if (PREDICT_UNLIKELY(need_to_update_have_min_dir_info)) { update_router_have_minimum_dir_info(); +- need_to_update_have_min_dir_info = 0; } + return have_min_dir_info; } -@@ -1493,25 +1505,10 @@ update_router_have_minimum_dir_info(void) - { - time_t now = time(NULL); - int res; -- static int disabled=0; - const or_options_t *options = get_options(); -- const networkstatus_t *consensus; -- int using_md; +@@ -1498,7 +1509,6 @@ update_router_have_minimum_dir_info(void) + const networkstatus_t *consensus = + networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); + int using_md; - const char *delay_fetches_msg = NULL; -- + + if (!consensus) { + if (!networkstatus_get_latest_consensus()) +@@ -1511,13 +1521,6 @@ update_router_have_minimum_dir_info(void) + goto done; + } + - if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { -- if (!disabled) -- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); +- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); - strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); - res = 0; -- disabled = 1; - goto done; -- } else { -- disabled = 0; - } - -- consensus = -+ const networkstatus_t *consensus = - networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); -+ int using_md; - - if (!consensus) { - if (!networkstatus_get_latest_consensus()) -@@ -1572,7 +1569,6 @@ update_router_have_minimum_dir_info(void) - control_event_client_status(LOG_NOTICE, "NOT_ENOUGH_DIR_INFO"); - } - have_min_dir_info = res; -- if (!disabled) -- need_to_update_have_min_dir_info = 0; -+ need_to_update_have_min_dir_info = 0; - } + using_md = consensus->flavor == FLAV_MICRODESC; + { -- 1.9.1

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits August 2014