April 2013 - tor-commits - lists.torproject.org

[translation/tsum_completed] Update translations for tsum_completed
by translation＠torproject.org 24 Apr '13

24 Apr '13

commit a38930370eeb28df0943903a30789895b501b665 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 24 19:15:16 2013 +0000 Update translations for tsum_completed --- zh_CN/short-user-manual_zh_CN_noimg.xhtml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zh_CN/short-user-manual_zh_CN_noimg.xhtml b/zh_CN/short-user-manual_zh_CN_noimg.xhtml index 856e0f6..0f8d2ac 100644 --- a/zh_CN/short-user-manual_zh_CN_noimg.xhtml +++ b/zh_CN/short-user-manual_zh_CN_noimg.xhtml @@ -120,7 +120,7 @@ sub 2048R/EB399FD7 2003-10-16 <p><strong>Vidalia 崩溃了，但 Tor 仍在运行</strong>：如果控制密码提示对话框有”重置“按钮，可点击该按钮。Vidalia 将使用新的随机控制密码重启 Tor。如果没有”重置“按钮，或者 Vidalia 无法重启 Tor，请打开进程或任务管理器，结束 Tor 进程，然后再用 Vidalia 来重启 Tor。</p> <p>更多信息，请参阅 Tor Project 网站上的<a href="https://torproject.org/docs/faq.html#VidaliaPassword">常见问题</a>。</p> <h3 id="flash-does-not-work">Flash 无法运行</h3> - <p>基于安全理由，Flash、Java 和其他插件目前是禁用于 Tor 的。独立运作于 Firefox 或者可在你电脑中进行活动的插件，会破坏你的隐匿。</p> + <p>出于安全考虑，当前 Tor 禁用了 Flash、Java 和其他插件。插件的运行独立于 Firefox，并且在计算机上某些活动可对你的匿名性造成危害。</p> <p>大多数 YouTube 视频兼容 HTML5，而 Tor 可以用于观看这些视频。你需要在 YouTube 网站上加入 <a href="https://www.youtube.com/html5">HTML5 体验计划</a> 才能使用 HTML5 播放器。</p> <p>请注意，浏览器被关闭后不会记住你加入过体验计划，所以你下次运行 Tor 浏览器软件包时将需要重新加入体验计划。</p> <p>请参阅 <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton 常见问题</a> 以了解更多信息。</p>

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 24 Apr '13

24 Apr '13

commit 0b26cb97d5e21bdc377ca36650146106ddfbc92c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 24 19:15:13 2013 +0000 Update translations for tsum --- zh_CN/short-user-manual_zh_CN_noimg.xhtml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zh_CN/short-user-manual_zh_CN_noimg.xhtml b/zh_CN/short-user-manual_zh_CN_noimg.xhtml index 856e0f6..0f8d2ac 100644 --- a/zh_CN/short-user-manual_zh_CN_noimg.xhtml +++ b/zh_CN/short-user-manual_zh_CN_noimg.xhtml @@ -120,7 +120,7 @@ sub 2048R/EB399FD7 2003-10-16 <p><strong>Vidalia 崩溃了，但 Tor 仍在运行</strong>：如果控制密码提示对话框有”重置“按钮，可点击该按钮。Vidalia 将使用新的随机控制密码重启 Tor。如果没有”重置“按钮，或者 Vidalia 无法重启 Tor，请打开进程或任务管理器，结束 Tor 进程，然后再用 Vidalia 来重启 Tor。</p> <p>更多信息，请参阅 Tor Project 网站上的<a href="https://torproject.org/docs/faq.html#VidaliaPassword">常见问题</a>。</p> <h3 id="flash-does-not-work">Flash 无法运行</h3> - <p>基于安全理由，Flash、Java 和其他插件目前是禁用于 Tor 的。独立运作于 Firefox 或者可在你电脑中进行活动的插件，会破坏你的隐匿。</p> + <p>出于安全考虑，当前 Tor 禁用了 Flash、Java 和其他插件。插件的运行独立于 Firefox，并且在计算机上某些活动可对你的匿名性造成危害。</p> <p>大多数 YouTube 视频兼容 HTML5，而 Tor 可以用于观看这些视频。你需要在 YouTube 网站上加入 <a href="https://www.youtube.com/html5">HTML5 体验计划</a> 才能使用 HTML5 播放器。</p> <p>请注意，浏览器被关闭后不会记住你加入过体验计划，所以你下次运行 Tor 浏览器软件包时将需要重新加入体验计划。</p> <p>请参阅 <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton 常见问题</a> 以了解更多信息。</p>

1 0

[tlsdate/master] Allow for generic builds when we do not explicitly support the OS
by ioerror＠torproject.org 24 Apr '13

24 Apr '13

commit b5bcf7626db282e859307609bb8ffdfafe43584d Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 11:39:54 2013 -0700 Allow for generic builds when we do not explicitly support the OS --- src/include.am | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/src/include.am b/src/include.am index 0ec38b2..a045759 100644 --- a/src/include.am +++ b/src/include.am @@ -308,6 +308,70 @@ if HAVE_ANDROID noinst_HEADERS+= src/common/android.h endif +# This is our explicit target list +# We do not attempt to build with PolarSSL +if !POLARSSL +if !TARGET_HAIKU +if !TARGET_LINUX +if !TARGET_OSX +if !TARGET_OPENBSD +if !TARGET_NETBSD +if !TARGET_FREEBSD +if !TARGET_DRAGONFLYBSD +if !TARGET_HAIKU +if !TARGET_CYGWIN +if !TARGET_BSD +bin_PROGRAMS+= src/tlsdate +bin_PROGRAMS+= src/tlsdate-helper + +src_conf_unittest_SOURCES = src/conf.c +src_conf_unittest_SOURCES+= src/conf-unittest.c +src_conf_unittest_SOURCES+= src/common/android.c +check_PROGRAMS+= src/conf_unittest +noinst_PROGRAMS+= src/conf_unittest +endif +endif +endif +endif +endif +endif +endif +endif +endif +endif +endif + +if !POLARSSL +if !TARGET_HAIKU +if !TARGET_LINUX +if !TARGET_OSX +if !TARGET_OPENBSD +if !TARGET_NETBSD +if !TARGET_FREEBSD +if !TARGET_DRAGONFLYBSD +if !TARGET_HAIKU +if !TARGET_CYGWIN +if !TARGET_BSD +src_proxy_bio_unittest_LDADD = @SSL_LIBS@ +src_proxy_bio_unittest_SOURCES = src/proxy-bio.c +src_proxy_bio_unittest_SOURCES+= src/proxy-bio-unittest.c +src_proxy_bio_unittest_SOURCES+= src/test-bio.c +src_proxy_bio_unittest_SOURCES+= src/util.c +src_proxy_bio_unittest_SOURCES+= src/common/android.c +check_PROGRAMS+= src/proxy-bio_unittest +noinst_PROGRAMS+= src/proxy-bio_unittest +endif +endif +endif +endif +endif +endif +endif +endif +endif +endif +endif + if !TARGET_OSX check_PROGRAMS+= src/test/proxy-override src/test/return-argc \ src/test/rotate src/test/sleep-wrap

1 0

[tlsdate/master] Update OS support list in INSTALL
by ioerror＠torproject.org 24 Apr '13

24 Apr '13

commit 4c596eb951f127d85f3b05d841336d8db66327e0 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 11:06:45 2013 -0700 Update OS support list in INSTALL --- INSTALL | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/INSTALL b/INSTALL index 170ad24..ebe01c4 100644 --- a/INSTALL +++ b/INSTALL @@ -15,7 +15,11 @@ tlsdate should build and work on the following Operating Systems: OpenBSD 5.2 Gentoo 20130413 DragonFly BSD 3.3-DEVELOPMENT + +tlsdate should build and may work on the following Operating Systems: + Cygwin CYGWIN_NT-6.1 1.7.18(0.263/5/3) + Haiku r1alpha4 Please file a bug or email the tlsdate team if you have successfully built or use tlsdate on a platform that is not listed. We are specifically looking for @@ -33,7 +37,6 @@ ports of tlsdate or for tlsdate integration on the following Operating Systems: Currently porting is in progress or partially documented for: Plan9 (with APE) - Haiku Building and install of tlsdate on GNU/Linux and FreeBSD: @@ -115,7 +118,7 @@ On Haiku we must use gcc4: export CC=/boot/develop/abi/x86/gcc4/tools/gcc4.6.3-haiku-121101/bin/gcc export LDFLAGS="$LDFLAGS -lbsd" - ./configure + ./configure # This includes the above exports currently make OpenBSD builds from source and is not yet in the port system:

1 0

[tor-launcher/master] Settings wizard: place focus on Connect button when on last panel.
by brade＠torproject.org 24 Apr '13

24 Apr '13

commit d5d926446f4ea461b6bc5659807c0a52a5f72b4c Author: Kathy Brade <brade(a)torproject.org> Date: Wed Apr 24 13:44:23 2013 -0400 Settings wizard: place focus on Connect button when on last panel. --- src/chrome/content/network-settings-wizard.xul | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index b86b885..249c9ce 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -93,7 +93,8 @@ </vbox> </wizardpage> - <wizardpage label=" " pageid="bridges" onextra1="onCopyLog();"> + <wizardpage label=" " pageid="bridges" onextra1="onCopyLog();" + onpageshow="showOrHideButton('finish', true, true)"> <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox>

1 0

[translation/tsum_completed] Update translations for tsum_completed
by translation＠torproject.org 24 Apr '13

24 Apr '13

commit 3ddf88ae7452a9b69bf676a9314ca08b7546060e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 24 17:45:16 2013 +0000 Update translations for tsum_completed --- zh_CN/short-user-manual_zh_CN_noimg.xhtml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_CN/short-user-manual_zh_CN_noimg.xhtml b/zh_CN/short-user-manual_zh_CN_noimg.xhtml index a32a40b..856e0f6 100644 --- a/zh_CN/short-user-manual_zh_CN_noimg.xhtml +++ b/zh_CN/short-user-manual_zh_CN_noimg.xhtml @@ -117,9 +117,9 @@ sub 2048R/EB399FD7 2003-10-16 <h3 id="vidalia-asks-for-a-password">Vidalia 要求输入密码</h3> <p>启动 Vidalia 时无需输入密码。如果出现密码输入提升，可能存在以下问题：</p> <p><strong>Vidalia 和 Tor 已在运行</strong>：例如，如果已安装 Vidalia 软件包，在尝试运行 Tor Browser Bundle 时可能出现这种情况。这时需关闭旧版的 Vidalia 和 Tor，然后运行当前版本。</p> - <p><strong>Vidalia 崩溃了，但 Tor 仍在运行</strong>：如果提示输入控制密码的对话框里有一个“复位设定”按钮，你可以点击该按钮，Vidalia 会以一个新的随机控制密码重启 Tor。如果你没有看到“复位设定”按钮，或者 Vidalia 无法重启 Tor，请前往你的进程或任务管理器，终止 Tor 的进程。然后再用 Vidalia 来重启 Tor。</p> - <p>要了解更多，请参阅 Tor Project 网站上的 <a href="https://torproject.org/docs/faq.html#VidaliaPassword">常见问题</a>。</p> - <h3 id="flash-does-not-work">Flash 无法工作</h3> + <p><strong>Vidalia 崩溃了，但 Tor 仍在运行</strong>：如果控制密码提示对话框有”重置“按钮，可点击该按钮。Vidalia 将使用新的随机控制密码重启 Tor。如果没有”重置“按钮，或者 Vidalia 无法重启 Tor，请打开进程或任务管理器，结束 Tor 进程，然后再用 Vidalia 来重启 Tor。</p> + <p>更多信息，请参阅 Tor Project 网站上的<a href="https://torproject.org/docs/faq.html#VidaliaPassword">常见问题</a>。</p> + <h3 id="flash-does-not-work">Flash 无法运行</h3> <p>基于安全理由，Flash、Java 和其他插件目前是禁用于 Tor 的。独立运作于 Firefox 或者可在你电脑中进行活动的插件，会破坏你的隐匿。</p> <p>大多数 YouTube 视频兼容 HTML5，而 Tor 可以用于观看这些视频。你需要在 YouTube 网站上加入 <a href="https://www.youtube.com/html5">HTML5 体验计划</a> 才能使用 HTML5 播放器。</p> <p>请注意，浏览器被关闭后不会记住你加入过体验计划，所以你下次运行 Tor 浏览器软件包时将需要重新加入体验计划。</p>

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 24 Apr '13

24 Apr '13

commit a35f0aac94341682a16f9cd10697b604c6572e54 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 24 17:45:13 2013 +0000 Update translations for tsum --- zh_CN/short-user-manual_zh_CN_noimg.xhtml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_CN/short-user-manual_zh_CN_noimg.xhtml b/zh_CN/short-user-manual_zh_CN_noimg.xhtml index a32a40b..856e0f6 100644 --- a/zh_CN/short-user-manual_zh_CN_noimg.xhtml +++ b/zh_CN/short-user-manual_zh_CN_noimg.xhtml @@ -117,9 +117,9 @@ sub 2048R/EB399FD7 2003-10-16 <h3 id="vidalia-asks-for-a-password">Vidalia 要求输入密码</h3> <p>启动 Vidalia 时无需输入密码。如果出现密码输入提升，可能存在以下问题：</p> <p><strong>Vidalia 和 Tor 已在运行</strong>：例如，如果已安装 Vidalia 软件包，在尝试运行 Tor Browser Bundle 时可能出现这种情况。这时需关闭旧版的 Vidalia 和 Tor，然后运行当前版本。</p> - <p><strong>Vidalia 崩溃了，但 Tor 仍在运行</strong>：如果提示输入控制密码的对话框里有一个“复位设定”按钮，你可以点击该按钮，Vidalia 会以一个新的随机控制密码重启 Tor。如果你没有看到“复位设定”按钮，或者 Vidalia 无法重启 Tor，请前往你的进程或任务管理器，终止 Tor 的进程。然后再用 Vidalia 来重启 Tor。</p> - <p>要了解更多，请参阅 Tor Project 网站上的 <a href="https://torproject.org/docs/faq.html#VidaliaPassword">常见问题</a>。</p> - <h3 id="flash-does-not-work">Flash 无法工作</h3> + <p><strong>Vidalia 崩溃了，但 Tor 仍在运行</strong>：如果控制密码提示对话框有”重置“按钮，可点击该按钮。Vidalia 将使用新的随机控制密码重启 Tor。如果没有”重置“按钮，或者 Vidalia 无法重启 Tor，请打开进程或任务管理器，结束 Tor 进程，然后再用 Vidalia 来重启 Tor。</p> + <p>更多信息，请参阅 Tor Project 网站上的<a href="https://torproject.org/docs/faq.html#VidaliaPassword">常见问题</a>。</p> + <h3 id="flash-does-not-work">Flash 无法运行</h3> <p>基于安全理由，Flash、Java 和其他插件目前是禁用于 Tor 的。独立运作于 Firefox 或者可在你电脑中进行活动的插件，会破坏你的隐匿。</p> <p>大多数 YouTube 视频兼容 HTML5，而 Tor 可以用于观看这些视频。你需要在 YouTube 网站上加入 <a href="https://www.youtube.com/html5">HTML5 体验计划</a> 才能使用 HTML5 播放器。</p> <p>请注意，浏览器被关闭后不会记住你加入过体验计划，所以你下次运行 Tor 浏览器软件包时将需要重新加入体验计划。</p>

1 0

[tor-launcher/master] Settings wizard: show "Copy Tor Log To Clipboard" button after error.
by brade＠torproject.org 24 Apr '13

24 Apr '13

commit b452a3cddb44e9888566cfa43c47234f3cbdfc40 Author: Kathy Brade <brade(a)torproject.org> Date: Wed Apr 24 13:36:57 2013 -0400 Settings wizard: show "Copy Tor Log To Clipboard" button after error. --- src/chrome/content/network-settings-wizard.xul | 14 +++-- src/chrome/content/network-settings.js | 59 ++++++++++++++++++++++-- src/components/tl-process.js | 3 + 3 files changed, 65 insertions(+), 11 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 7f27e06..b86b885 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -18,6 +18,7 @@ title="&torsettings.dialog.title;" windowtype="TorLauncher:NetworkSettings" persist="screenX screenY" + buttonlabelextra1="&torsettings.copyLog;" onwizardfinish="return applySettings();" onwizardcancel="return onCancel();" onload="initDialog();"> @@ -25,7 +26,7 @@ <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/> - <wizardpage label=" " pageid="proxy" next="firewall" + <wizardpage label=" " pageid="proxy" next="firewall" onextra1="onCopyLog();" onpageadvanced="return onWizardProxyNext(this);"> <hbox class="tbb-header"> <vbox class="tbb-logo-box" align="start"> @@ -51,7 +52,7 @@ </hbox> </wizardpage> - <wizardpage pageid="proxyYES" next="firewall" + <wizardpage pageid="proxyYES" next="firewall" onextra1="onCopyLog();" onpageadvanced="return (getAndValidateProxySettings() != null)"> <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> @@ -61,7 +62,7 @@ <groupbox id="proxySpecificSettings" /> </wizardpage> - <wizardpage pageid="firewall" next="bridges" + <wizardpage pageid="firewall" next="bridges" onextra1="onCopyLog();" onpageadvanced="return onWizardFirewallNext(this);"> <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> @@ -80,7 +81,7 @@ </hbox> </wizardpage> - <wizardpage pageid="firewallYES" next="bridges" + <wizardpage pageid="firewallYES" next="bridges" onextra1="onCopyLog();" onpageadvanced="return (getAndValidateFirewallSettings() != null)"> <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> @@ -92,7 +93,7 @@ </vbox> </wizardpage> - <wizardpage label=" " pageid="bridges"> + <wizardpage label=" " pageid="bridges" onextra1="onCopyLog();"> <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox> @@ -113,7 +114,8 @@ <spring flex="1" /> </wizardpage> - <wizardpage label=" " pageid="errorPanel" next="notUsed"> + <wizardpage label=" " pageid="errorPanel" next="notUsed" + onextra1="onCopyLog();"> </wizardpage> <wizardpage class="help" label=" " pageid="bridgeHelp" next="notUsed" diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 73edd8d..904e5f8 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -18,6 +18,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", const kTorProcessReadyTopic = "TorProcessIsReady"; const kTorProcessExitedTopic = "TorProcessExited"; const kTorProcessDidNotStartTopic = "TorProcessDidNotStart"; +const kTorBootstrapErrorTopic = "TorBootstrapError"; const kWizardProxyRadioGroup = "proxyRadioGroup"; const kWizardFirewallRadioGroup = "firewallRadioGroup"; @@ -54,10 +55,10 @@ var gRestoreAfterHelpPanelID = null; function initDialog() { + var cancelBtn = document.documentElement.getButton("cancel"); gIsInitialBootstrap = window.arguments[0]; if (gIsInitialBootstrap) { - var cancelBtn = document.documentElement.getButton("cancel"); if (cancelBtn) { var quitKey = (TorLauncherUtil.isWindows) ? "quit_win" : "quit"; @@ -88,14 +89,27 @@ function initDialog() gObsService = Cc["@mozilla.org/observer-service;1"] .getService(Ci.nsIObserverService); - var haveWizard = (getWizard() != null); + var wizardElem = getWizard(); + var haveWizard = (wizardElem != null); if (haveWizard) { + // Set "Copy Tor Log" label and move it after the Quit (cancel) button. + var copyLogBtn = document.documentElement.getButton("extra1"); + if (copyLogBtn) + { + copyLogBtn.label = wizardElem.getAttribute("buttonlabelextra1"); + if (cancelBtn && !TorLauncherUtil.isWindows) + cancelBtn.parentNode.insertBefore(copyLogBtn, cancelBtn.nextSibling); + } + + // Use "Connect" as the finish button label (on the last wizard page).. var finishBtn = document.documentElement.getButton("finish"); if (finishBtn) finishBtn.label = TorLauncherUtil.getLocalizedString("connect"); } + gObsService.addObserver(gObserver, kTorBootstrapErrorTopic, false); + if (TorLauncherUtil.shouldStartAndOwnTor && !gTorProcessService.TorIsProcessReady) { @@ -154,6 +168,13 @@ function onWizardFirewallNext(aWizPage) var gObserver = { observe: function(aSubject, aTopic, aData) { + if (kTorBootstrapErrorTopic == aTopic) + { + wizardShowCopyLogButton(); + return; + } + + // Process events that only occur once. gObsService.removeObserver(gObserver, kTorProcessReadyTopic); gObsService.removeObserver(gObserver, kTorProcessExitedTopic); gObsService.removeObserver(gObserver, kTorProcessDidNotStartTopic); @@ -170,8 +191,8 @@ var gObserver = { readTorSettings(); } else if (kTorProcessDidNotStartTopic == aTopic) - showPanel("errorPanel"); - else + showErrorPanel(); + else // kTorProcessExitedTopic close(); } }; @@ -194,7 +215,7 @@ function readTorSettings() if (!didSucceed) { // Unable to communicate with tor. Hide settings and display an error. - showPanel("errorPanel"); + showErrorPanel(); setTimeout(function() { @@ -225,6 +246,27 @@ function showPanel(aPanelID) } +function showErrorPanel() +{ + showPanel("errorPanel"); + wizardShowCopyLogButton(); +} + + +function wizardShowCopyLogButton() +{ + if (getWizard()) + { + var copyLogBtn = document.documentElement.getButton("extra1"); + if (copyLogBtn) + { + copyLogBtn.setAttribute("wizardCanCopyLog", true); + copyLogBtn.removeAttribute("hidden"); + } + } +} + + function showOrHideButton(aID, aShow, aFocus) { var btn = setButtonAttr(aID, "hidden", !aShow); @@ -327,6 +369,7 @@ function onOpenHelp() { showOrHideButton("cancel", false, false); showOrHideButton("back", false, false); + showOrHideButton("extra1", false, false); overrideButtonLabel("next", "done"); } else @@ -345,6 +388,9 @@ function closeHelp() { showOrHideButton("cancel", true, false); showOrHideButton("back", true, false); + var copyLogBtn = document.documentElement.getButton("extra1"); + if (copyLogBtn && copyLogBtn.hasAttribute("wizardCanCopyLog")) + copyLogBtn.removeAttribute("hidden"); restoreButtonLabel("next"); } else @@ -775,6 +821,9 @@ function showSaveSettingsAlert(aDetails) var s = TorLauncherUtil.getFormattedLocalizedString( "failed_to_save_settings", [aDetails], 1); TorLauncherUtil.showAlert(window, s); + + showOrHideButton("extra1", true, false); + gWizIsCopyLogBtnShowing = true; } diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 2d24360..1057795 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -387,6 +387,9 @@ TorProcessService.prototype = var s = TorLauncherUtil.getFormattedLocalizedString( "tor_bootstrap_failed", [aStatusObj.WARNING], 1); TorLauncherUtil.showAlert(null, s); + + this.mObsSvc.notifyObservers(null, "TorBootstrapError", + aStatusObj.WARNING); } } }

1 0

[tor/maint-0.2.3] Avoid busy-looping on WANTREAD within connection_handle_write
by nickm＠torproject.org 24 Apr '13

24 Apr '13

commit 39ac1db60e8b920e1e6b07e08f7f3343960ece79 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 10 19:30:41 2013 -0400 Avoid busy-looping on WANTREAD within connection_handle_write Fix for bug 5650. Also, if we get a WANTREAD while reading while writing, make sure we're reading. --- changes/bug5650 | 5 +++++ src/or/connection.c | 17 ++++++++++++++++- src/or/or.h | 3 +++ 3 files changed, 24 insertions(+), 1 deletions(-) diff --git a/changes/bug5650 b/changes/bug5650 new file mode 100644 index 0000000..401e317 --- /dev/null +++ b/changes/bug5650 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Avoid a bug where our response to TLS renegotation under certain + network conditions could lead to a busy-loop, with 100% CPU + consumption. Fixes bug 5650; bugfix on 0.2.0.16-alpha. + diff --git a/src/or/connection.c b/src/or/connection.c index eac9c4f..e366e0e 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2825,7 +2825,20 @@ connection_read_to_buf(connection_t *conn, ssize_t *max_to_read, case TOR_TLS_WANTWRITE: connection_start_writing(conn); return 0; - case TOR_TLS_WANTREAD: /* we're already reading */ + case TOR_TLS_WANTREAD: + if (conn->in_connection_handle_write) { + /* We've been invoked from connection_handle_write, because we're + * waiting for a TLS renegotiation, the renegotiation started, and + * SSL_read returned WANTWRITE. But now SSL_read is saying WANTREAD + * again. Stop waiting for write events now, or else we'll + * busy-loop until data arrives for us to read. */ + connection_stop_writing(conn); + if (!connection_is_reading(conn)) + connection_start_reading(conn); + } + /* we're already reading, one hopes */ + result = 0; + break; case TOR_TLS_DONE: /* no data read, so nothing to process */ result = 0; break; /* so we call bucket_decrement below */ @@ -3337,7 +3350,9 @@ connection_handle_write(connection_t *conn, int force) { int res; tor_gettimeofday_cache_clear(); + conn->in_connection_handle_write = 1; res = connection_handle_write_impl(conn, force); + conn->in_connection_handle_write = 0; return res; } diff --git a/src/or/or.h b/src/or/or.h index 51c23d3..6728b86 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -998,6 +998,9 @@ typedef struct connection_t { /** Set to 1 when we're inside connection_flushed_some to keep us from * calling connection_handle_write() recursively. */ unsigned int in_flushed_some:1; + /** True if connection_handle_write is currently running on this connection. + */ + unsigned int in_connection_handle_write:1; /* For linked connections: */

1 0

[translation/tsum_completed] Update translations for tsum_completed
by translation＠torproject.org 24 Apr '13

24 Apr '13

commit 7573b67aa0d28b271f5f4aa70c0516628543393e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 24 16:15:16 2013 +0000 Update translations for tsum_completed --- zh_CN/short-user-manual_zh_CN_noimg.xhtml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zh_CN/short-user-manual_zh_CN_noimg.xhtml b/zh_CN/short-user-manual_zh_CN_noimg.xhtml index d4b895b..a32a40b 100644 --- a/zh_CN/short-user-manual_zh_CN_noimg.xhtml +++ b/zh_CN/short-user-manual_zh_CN_noimg.xhtml @@ -116,7 +116,7 @@ sub 2048R/EB399FD7 2003-10-16 </ol> <h3 id="vidalia-asks-for-a-password">Vidalia 要求输入密码</h3> <p>启动 Vidalia 时无需输入密码。如果出现密码输入提升，可能存在以下问题：</p> - <p><strong>Vidalia 和 Tor 已在运行</strong>：举个例子，假如你已安装过 Vidalia 软件包而你现在正尝试运行 Tor 浏览器软件包，这种情况就有可能发生。这样的话你将需要先关闭旧版的 Vidalia 和 Tor，再运行当前的版本。</p> + <p><strong>Vidalia 和 Tor 已在运行</strong>：例如，如果已安装 Vidalia 软件包，在尝试运行 Tor Browser Bundle 时可能出现这种情况。这时需关闭旧版的 Vidalia 和 Tor，然后运行当前版本。</p> <p><strong>Vidalia 崩溃了，但 Tor 仍在运行</strong>：如果提示输入控制密码的对话框里有一个“复位设定”按钮，你可以点击该按钮，Vidalia 会以一个新的随机控制密码重启 Tor。如果你没有看到“复位设定”按钮，或者 Vidalia 无法重启 Tor，请前往你的进程或任务管理器，终止 Tor 的进程。然后再用 Vidalia 来重启 Tor。</p> <p>要了解更多，请参阅 Tor Project 网站上的 <a href="https://torproject.org/docs/faq.html#VidaliaPassword">常见问题</a>。</p> <h3 id="flash-does-not-work">Flash 无法工作</h3>

1 0