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

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 13 Sep '13

13 Sep '13

commit d89f7f9b209a8b01dff75013bbbe2b923e364174 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 13 21:16:11 2013 +0000 Update translations for torcheck_completed --- eo/torcheck.po | 56 +++++++++++++++++++++++--------------------------------- 1 file changed, 23 insertions(+), 33 deletions(-) diff --git a/eo/torcheck.po b/eo/torcheck.po index c88d731..aa80466 100644 --- a/eo/torcheck.po +++ b/eo/torcheck.po @@ -1,29 +1,39 @@ # TorCheck gettext … [View More]template -# Copyright (C) 2008 Jacob Appelbaum +# Copyright (C) 2008-2012 The Tor Project, Inc # # Translators: +# naza_loligo <cjk34(a)cam.ac.uk>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2008-04-24 20:28+PDT\n" -"PO-Revision-Date: 2012-02-14 10:00+0000\n" -"Last-Translator: etrapani <etrapani(a)gmail.com>\n" -"Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" +"POT-Creation-Date: 2012-02-16 20:28+PDT\n" +"PO-Revision-Date: 2013-09-13 21:15+0000\n" +"Last-Translator: naza_loligo <cjk34(a)cam.ac.uk>\n" +"Language-Team: Esperanto (http://www.transifex.com/projects/p/torproject/language/eo/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: pygettext.py 1.5\n" "Language: eo\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Congratulations. Your browser is configured to use Tor." msgstr "Gratulon! Via retesplorilo estas agordita por uzi Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " -"for further information about using Tor safely." -msgstr "Bonvolu iri al <a href=\"https://www.torproject.org/\">paĝaro de Tor</a> por pli da informo pri sekura uzado de Tor." +"for further information about using Tor safely. You are now free to browse " +"the Internet anonymously." +msgstr "Bonvolu iri al <a href=\"https://www.torproject.org/\">paĝaro de Tor</a> por pli da informo pri sekura uzado de Tor. Vi nun povos retumi anonime." + +msgid "There is a security update available for the Tor Browser Bundle." +msgstr "Haveblas sekureca ĝisdatigo por la Tor retumilo-fasko." + +msgid "" +"<a href=\"https://www.torproject.org/download/download-easy.html\">Click " +"here to go to the download page</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Klaku ĉi-tie por iri al la elŝut-paĝo</a>" msgid "Sorry. You are not using Tor." msgstr "Pardonu, ni bedaŭras. Vi ne uzas Tor nuntempe." @@ -31,37 +41,17 @@ msgstr "Pardonu, ni bedaŭras. Vi ne uzas Tor nuntempe." msgid "" "If you are attempting to use a Tor client, please refer to the <a " "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" -" " -"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">instructions" -" for configuring your Tor client</a>." -msgstr "Se vi klopodas uzi klienton de Tor, bonvolu iri al la <a href=\"https://www.torproject.org/\">paĝaro de Tor</a>, specife al la <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">instrukcioj por agordi vian klienton de Tor</a>." +" href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " +"configuring your Tor client</a>." +msgstr "Se vi klopodas uzi klienton de Tor, bonvolu iri al la <a href=\"https://www.torproject.org/\">paĝaro de Tor</a>, specife al la <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instrukcioj por agordi vian klienton de Tor</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Pardonu, via peto ne suckesis aŭ neatendita respondo estis ricevita." msgid "" "A temporary service outage prevents us from determining if your source IP " -"address is a <a href=\"https://www.torproject.org/\">Tor</a> node. For " -"other ways to test whether you are using Tor, please visit <a " -"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPri…">this" -" FAQ entry</a>." -msgstr "Tempa paneo en la servo malpermesas al ni decidi ĉu via origina IP adreso estas tiu de nodo de <a href=\"https://www.torproject.org/\">Tor</a>. Por koni aliajn manierojn kontroli ĉu vi uzas Tor nuntempe bonvolu viziti <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPri…">tiun ĉi demandon en la oftaj demandoj (FAQ)</a>." - -msgid "Additional information: " -msgstr "Aldona informo: " +"address is a <a href=\"https://www.torproject.org/\">Tor</a> node." +msgstr "Tempa paneo en la servo malpermesas al ni decidi ĉu via origina IP adreso estas tiu de nodo de <a href=\"https://www.torproject.org/\">Tor</a>. " msgid "Your IP address appears to be: " msgstr "Via IP adreso ŝajnas esti: " - -msgid "" -"This small script is powered by <a " -"href=\"http://exitlist.torproject.org/\">tordnsel</a>" -msgstr "Tiu ĉi eta skripto estas funkciitgata de <a href=\"http://exitlist.torproject.org/\">tordnsel</a>" - -msgid "" -"You may also be interested in the <a href=\"/cgi-" -"bin/TorBulkExitList.py\">Tor Bulk Exit List Exporter</a>" -msgstr "Vin eble interesos ankaŭ la <a href=\"/cgi-bin/TorBulkExitList.py\">eksportilo de kompleta listo de elirpunktoj de Tor</a>" - -msgid "This server does not log any information about visitors." -msgstr "Tiu ĉi servilo ne skribas en taglibro iun ajn informon pri vizitantoj." [View Less]

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 13 Sep '13

13 Sep '13

commit 7a807f480c0fd222908409a72bbb7a2a5f2eb0ac Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 13 21:16:08 2013 +0000 Update translations for torcheck --- eo/torcheck.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/eo/torcheck.po b/eo/torcheck.po index 9c7cc67..aa80466 100644 --- a/eo/torcheck.po +++ b/eo/torcheck.po @@ -2,14 +2,15 @@ # Copyright (C) 2008-2012 The Tor Project, Inc # # Translators: +# … [View More]naza_loligo <cjk34(a)cam.ac.uk>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-04-29 08:18+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" +"PO-Revision-Date: 2013-09-13 21:15+0000\n" +"Last-Translator: naza_loligo <cjk34(a)cam.ac.uk>\n" +"Language-Team: Esperanto (http://www.transifex.com/projects/p/torproject/language/eo/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,15 +25,15 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "" +msgstr "Bonvolu iri al <a href=\"https://www.torproject.org/\">paĝaro de Tor</a> por pli da informo pri sekura uzado de Tor. Vi nun povos retumi anonime." msgid "There is a security update available for the Tor Browser Bundle." -msgstr "" +msgstr "Haveblas sekureca ĝisdatigo por la Tor retumilo-fasko." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Klaku ĉi-tie por iri al la elŝut-paĝo</a>" msgid "Sorry. You are not using Tor." msgstr "Pardonu, ni bedaŭras. Vi ne uzas Tor nuntempe." @@ -42,7 +43,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "" +msgstr "Se vi klopodas uzi klienton de Tor, bonvolu iri al la <a href=\"https://www.torproject.org/\">paĝaro de Tor</a>, specife al la <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instrukcioj por agordi vian klienton de Tor</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Pardonu, via peto ne suckesis aŭ neatendita respondo estis ricevita." @@ -50,7 +51,7 @@ msgstr "Pardonu, via peto ne suckesis aŭ neatendita respondo estis ricevita." msgid "" "A temporary service outage prevents us from determining if your source IP " "address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "" +msgstr "Tempa paneo en la servo malpermesas al ni decidi ĉu via origina IP adreso estas tiu de nodo de <a href=\"https://www.torproject.org/\">Tor</a>. " msgid "Your IP address appears to be: " msgstr "Via IP adreso ŝajnas esti: " [View Less]

1 0

[tor-launcher/master] Show "Tor unexpectedly exited" message inside Network Settings dialog.
by brade＠torproject.org 13 Sep '13

13 Sep '13

commit 7c4d4c620ab5ef3f84725e674d0e9f98fa38e0d0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Sep 13 15:01:48 2013 -0400 Show "Tor unexpectedly exited" message inside Network Settings dialog. Detect when the tor process exits, display an informative message along with a Restart button inside the Tor Network Settings dialog/wizard. --- src/chrome/content/network-settings-wizard.xul | 8 ++- src/chrome/content/network-settings.js | 81 +++++++++++… [View More]++++++++----- src/chrome/content/network-settings.xul | 8 ++- src/chrome/locale/en/network-settings.dtd | 1 + src/chrome/locale/en/torlauncher.properties | 1 + src/chrome/skin/network-settings.css | 8 ++- src/components/tl-process.js | 28 ++++++-- 7 files changed, 110 insertions(+), 25 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index ed822f7..0002af4 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -129,7 +129,13 @@ <spring flex="1" /> <hbox> <spring flex="1" /> - <label value="&torsettings.startingTor;"/> + <description id="startingTorMessage">&torsettings.startingTor;</description> + <spring flex="1" /> + </hbox> + <hbox> + <spring flex="1" /> + <button id="restartButton" label="&torsettings.restart;" hidden="true" + oncommand="onRestartApp()" /> <spring flex="1" /> </hbox> <spring flex="1" /> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 573393d..27b6f58 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -144,19 +144,14 @@ function initDialog() gObsService.addObserver(gObserver, kTorBootstrapErrorTopic, false); gObsService.addObserver(gObserver, kTorLogHasWarnOrErrTopic, false); + gObsService.addObserver(gObserver, kTorProcessExitedTopic, false); + var status = gTorProcessService.TorProcessStatus; if (TorLauncherUtil.shouldStartAndOwnTor && - !gTorProcessService.TorIsProcessReady) + (status != gTorProcessService.kStatusRunning)) { - showPanel("startingTor"); - if (haveWizard) - { - showOrHideButton("back", false, false); - showOrHideButton("next", false, false); - } - + showStartingTorPanel(status == gTorProcessService.kStatusExited); gObsService.addObserver(gObserver, kTorProcessReadyTopic, false); - gObsService.addObserver(gObserver, kTorProcessExitedTopic, false); gObsService.addObserver(gObserver, kTorProcessDidNotStartTopic, false); } else @@ -223,13 +218,9 @@ var gObserver = { return; } - // Process events that only occur once. - gObsService.removeObserver(gObserver, kTorProcessReadyTopic); - gObsService.removeObserver(gObserver, kTorProcessExitedTopic); - gObsService.removeObserver(gObserver, kTorProcessDidNotStartTopic); - if (kTorProcessReadyTopic == aTopic) { + gObsService.removeObserver(gObserver, kTorProcessReadyTopic); var haveWizard = (getWizard() != null); showPanel(haveWizard ? "first" : "settings"); if (haveWizard) @@ -240,9 +231,15 @@ var gObserver = { readTorSettings(); } else if (kTorProcessDidNotStartTopic == aTopic) + { + gObsService.removeObserver(gObserver, kTorProcessDidNotStartTopic); showErrorPanel(); - else // kTorProcessExitedTopic - close(); + } + else if (kTorProcessExitedTopic == aTopic) + { + gObsService.removeObserver(gObserver, kTorProcessExitedTopic); + showStartingTorPanel(true); + } } }; @@ -295,6 +292,33 @@ function showPanel(aPanelID) } +function showStartingTorPanel(aTorExited) +{ + if (aTorExited) + { + // Show "Tor exited; please restart" message and Restart button. + var elem = document.getElementById("startingTorMessage"); + if (elem) + { + var s1 = TorLauncherUtil.getLocalizedString("tor_exited"); + var s2 = TorLauncherUtil.getLocalizedString("please_restart_app"); + elem.textContent = s1 + "\n\n" + s2; + } + var btn = document.getElementById("restartButton"); + if (btn) + btn.removeAttribute("hidden"); + } + + showPanel("startingTor"); + var haveWizard = (getWizard() != null); + if (haveWizard) + { + showOrHideButton("back", false, false); + showOrHideButton("next", false, false); + } +} + + function showErrorPanel() { showPanel("errorPanel"); @@ -425,6 +449,31 @@ function onProxyTypeChange() } +function onRestartApp() +{ + if (gIsInitialBootstrap) + { + // If the browser has not fully started yet, we cannot use the app startup + // service to restart it... so we use a delayed approach. + try + { + var obsSvc = Cc["@mozilla.org/observer-service;1"] + .getService(Ci.nsIObserverService); + obsSvc.notifyObservers(null, "TorUserRequestedQuit", "restart"); + + window.close(); + } catch (e) {} + } + else + { + // Restart now. + var asSvc = Cc["@mozilla.org/toolkit/app-startup;1"] + .getService(Ci.nsIAppStartup); + asSvc.quit(asSvc.eAttemptQuit | asSvc.eRestart); + } +} + + function onCancel() { if (gRestoreAfterHelpPanelID) // Is help open? diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index f50e4f6..ae4eb8d 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -57,7 +57,13 @@ <spring flex="1" /> <hbox> <spring flex="1" /> - <label value="&torsettings.startingTor;"/> + <description id="startingTorMessage">&torsettings.startingTor;</description> + <spring flex="1" /> + </hbox> + <hbox> + <spring flex="1" /> + <button id="restartButton" label="&torsettings.restart;" hidden="true" + oncommand="onRestartApp()" /> <spring flex="1" /> </hbox> <spring flex="1" /> diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index b9fedc3..3017865 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -27,6 +27,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> +<!ENTITY torsettings.restart "Restart"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 5ed593a..483ce43 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 1d92151..7ab28c1 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -95,9 +95,15 @@ button.firstAnswer { min-height: 300px; } -#startingTor label { +wizardpage[pageid="startingTor"] description, +#startingTor description { font-size: 120%; font-weight: bold; + white-space: pre-wrap; +} + +#restartButton { + margin-top: 20px; } dialog .help { diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 17c4012..c4f977c 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -36,6 +36,11 @@ TorProcessService.prototype = kMaxControlConnRetryMS: 500, kControlConnTimeoutMS: 30000, // Wait at most 30 seconds for tor to start. + kStatusUnknown: 0, // Tor process status. + kStatusStarting: 1, + kStatusRunning: 2, + kStatusExited: 3, // Exited or failed to start. + // nsISupports implementation. QueryInterface: function(aIID) { @@ -114,6 +119,7 @@ TorProcessService.prototype = } this.mTorProcess = null; + this.mTorProcessStatus = this.kStatusExited; this.mObsSvc.notifyObservers(null, "TorProcessExited", null); @@ -132,7 +138,7 @@ TorProcessService.prototype = if (haveConnection) { this.mControlConnTimer = null; - this.mIsTorProcessReady = true; + this.mTorProcessStatus = this.kStatusRunning; this.mProtocolSvc.TorStartEventMonitor(); this.mProtocolSvc.TorRetrieveBootstrapStatus(); @@ -164,7 +170,10 @@ TorProcessService.prototype = else if (kOpenNetworkSettingsTopic == aTopic) this._openNetworkSettings(false); else if (kUserQuitTopic == aTopic) + { this.mQuitSoon = true; + this.mRestartWithQuit = ("restart" == aParam); + } }, canUnload: function(aCompMgr) { return true; }, @@ -201,9 +210,9 @@ TorProcessService.prototype = // Public Properties and Methods /////////////////////////////////////////// - get TorIsProcessReady() + get TorProcessStatus() { - return (this.mTorProcess) ? this.mIsTorProcessReady : false; + return this.mTorProcessStatus; }, get TorIsBootstrapDone() @@ -225,7 +234,7 @@ TorProcessService.prototype = // Private Member Variables //////////////////////////////////////////////// - mIsTorProcessReady: false, + mTorProcessStatus: 0, // kStatusUnknown mIsBootstrapDone: false, mBootstrapErrorOccurred: false, mIsQuitting: false, @@ -237,6 +246,7 @@ TorProcessService.prototype = mControlConnTimer: null, mControlConnDelayMS: 0, mQuitSoon: false, // Quit was requested by the user; do so soon. + mRestartWithQuit: false, mLastTorWarningPhase: null, mLastTorWarningText: null, @@ -244,7 +254,7 @@ TorProcessService.prototype = // Private Methods ///////////////////////////////////////////////////////// _startTor: function() { - this.mIsTorProcessReady = false; + this.mTorProcessStatus = this.kStatusUnknown; var isInitialBootstrap = TorLauncherUtil.getBoolPref(this.kPrefPromptAtStartup); @@ -300,6 +310,8 @@ TorProcessService.prototype = args.push("1"); } + this.mTorProcessStatus = this.kStatusStarting; + var p = Cc["@mozilla.org/process/util;1"].createInstance(Ci.nsIProcess); p.init(exeFile); @@ -335,7 +347,10 @@ TorProcessService.prototype = var asSvc = Cc["@mozilla.org/toolkit/app-startup;1"] .getService(Ci.nsIAppStartup); - asSvc.quit(asSvc.eAttemptQuit); + var flags = asSvc.eAttemptQuit; + if (this.mRestartWithQuit) + flags |= asSvc.eRestart; + asSvc.quit(flags); } catch (e) { @@ -344,6 +359,7 @@ TorProcessService.prototype = } catch (e) { + this.mTorProcessStatus = this.kStatusExited; var s = TorLauncherUtil.getLocalizedString("tor_failed_to_start"); TorLauncherUtil.showAlert(null, s); TorLauncherLogger.safelog(4, "_startTor error: ", e); [View Less]

1 0

[tor/master] Fix a windows compilation warning from 4647 branch
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit 147a0f31bd72cfd285f7a6e0867b490262469ccd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 13 13:10:17 2013 -0400 Fix a windows compilation warning from 4647 branch --- src/or/ntmain.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/ntmain.c b/src/or/ntmain.c index 2fa074d..e848314 100644 --- a/src/or/ntmain.c +++ b/src/or/ntmain.c @@ -314,6 +314,7 @@ nt_service_main(void) case CMD_LIST_FINGERPRINT: case CMD_HASH_PASSWORD: case … [View More]

1 0

[tor/master] Merge remote-tracking branch 'Ryman/bug6384'
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit 25a3ae922f2f378c16c5930b76c33917480120d8 Merge: f4db0f4 b539b37 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 13 12:55:53 2013 -0400 Merge remote-tracking branch 'Ryman/bug6384' Conflicts: src/or/config.c src/or/main.c changes/bug6384 | 2 ++ src/common/compat_libevent.c | 8 +++++++ src/common/compat_libevent.h | 1 + src/common/crypto.c | 49 +++++++++++++++++++++++++++++++----------- src/common/crypto.h … [View More] | 1 + src/common/torgzip.c | 16 ++++++++++++++ src/common/torgzip.h | 6 ++++++ src/or/config.c | 19 ++++++++++++++++ src/or/main.c | 10 +++++---- 9 files changed, 95 insertions(+), 17 deletions(-) diff --cc src/or/config.c index 9a8d1e7,b00f0d6..5ce7bad --- a/src/or/config.c +++ b/src/or/config.c @@@ -1794,48 -1791,15 +1795,49 @@@ options_act(const or_options_t *old_opt return 0; } -/** Helper: Read a list of configuration options from the command line. - * If successful, put them in *result and return 0, and return - * -1 and leave *result alone. */ -static int -config_get_commandlines(int argc, char **argv, config_line_t **result) +static const struct { + const char *name; + int takes_argument; +} CMDLINE_ONLY_OPTIONS[] = { + { "-f", 1 }, + { "--defaults-torrc", 1 }, + { "--hash-password", 1 }, + { "--dump-config", 1 }, + { "--list-fingerprint", 0 }, + { "--verify-config", 0 }, + { "--ignore-missing-torrc", 0 }, + { "--quiet", 0 }, + { "--hush", 0 }, + { "--version", 0 }, ++ { "--library-versions", 0 }, + { "-h", 0 }, + { "--help", 0 }, + { "--list-torrc-options", 0 }, + { "--digests", 0 }, + { "--nt-service", 0 }, + { "-nt-service", 0 }, + { NULL, 0 }, +}; + +/** Helper: Read a list of configuration options from the command line. If + * successful, or if ignore_errors is set, put them in *result, put the + * commandline-only options in *cmdline_result, and return 0; + * otherwise, return -1 and leave *result and cmdline_result + * alone. */ +int +config_parse_commandline(int argc, char **argv, int ignore_errors, + config_line_t **result, + config_line_t **cmdline_result) { + config_line_t *param = NULL; + config_line_t *front = NULL; config_line_t **new = &front; - char *s; + + config_line_t *front_cmdline = NULL; + config_line_t **new_cmdline = &front_cmdline; + + char *s, *arg; int i = 1; while (i < argc) { @@@ -3932,24 -3817,48 +3934,41 @@@ options_init_from_torrc(int argc, char printf("Tor version %s.\n",get_version()); exit(0); } + - if (argc > 1 && (!strcmp(argv[1],"--digests"))) { + if (config_line_find(cmdline_only_options, "--digests")) { printf("Tor version %s.\n",get_version()); printf("%s", libor_get_digests()); printf("%s", tor_get_digests()); exit(0); } - if (argc > 1 && (!strcmp(argv[1],"--library-versions"))) { ++ if (config_line_find(cmdline_only_options, "--library-versions")) { + printf("Tor version %s. \n", get_version()); + printf("Library versions\tCompiled\t\tRuntime\n"); + printf("Libevent\t\t%-15s\t\t%s\n", + tor_libevent_get_header_version_str(), + tor_libevent_get_version_str()); + printf("OpenSSL \t\t%-15s\t\t%s\n", + crypto_openssl_get_header_version_str(), + crypto_openssl_get_version_str()); + printf("Zlib \t\t%-15s\t\t%s\n", + tor_zlib_get_header_version_str(), + tor_zlib_get_version_str()); + //TODO: Hex versions? + exit(0); + } + - /* Go through command-line variables */ - if (!global_cmdline_options) { - /* Or we could redo the list every time we pass this place. - * It does not really matter */ - if (config_get_commandlines(argc, argv, &global_cmdline_options) < 0) { - goto err; - } - } - command = CMD_RUN_TOR; - for (i = 1; i < argc; ++i) { - if (!strcmp(argv[i],"--list-fingerprint")) { + for (p_index = cmdline_only_options; p_index; p_index = p_index->next) { + if (!strcmp(p_index->key,"--list-fingerprint")) { command = CMD_LIST_FINGERPRINT; - } else if (!strcmp(argv[i],"--hash-password")) { + } else if (!strcmp(p_index->key, "--hash-password")) { command = CMD_HASH_PASSWORD; - command_arg = tor_strdup( (i < argc-1) ? argv[i+1] : ""); - ++i; - } else if (!strcmp(argv[i],"--verify-config")) { + command_arg = p_index->value; + } else if (!strcmp(p_index->key, "--dump-config")) { + command = CMD_DUMP_CONFIG; + command_arg = p_index->value; + } else if (!strcmp(p_index->key, "--verify-config")) { command = CMD_VERIFY_CONFIG; } } diff --cc src/or/main.c index ceee29c,2d6ca74..ac756de --- a/src/or/main.c +++ b/src/or/main.c @@@ -2339,28 -2333,19 +2339,29 @@@ tor_init(int argc, char *argv[] addressmap_init(); /* Init the client dns cache. Do it always, since it's * cheap. */ + { /* We search for the "quiet" option first, since it decides whether we * will log anything at all to the command line. */ - for (i=1;i<argc;++i) { - if (!strcmp(argv[i], "--hush")) - quiet = 1; - if (!strcmp(argv[i], "--quiet")) - quiet = 2; - /* --version implies --quiet */ - if (!strcmp(argv[i], "--version")) - quiet = 2; - if (!strcmp(argv[i], "--library-versions")) - quiet = 2; + config_line_t *opts = NULL, *cmdline_opts = NULL; + const config_line_t *cl; + (void) config_parse_commandline(argc, argv, 1, &opts, &cmdline_opts); + for (cl = cmdline_opts; cl; cl = cl->next) { + if (!strcmp(cl->key, "--hush")) + quiet = 1; + if (!strcmp(cl->key, "--quiet") || + !strcmp(cl->key, "--dump-config")) + quiet = 2; - /* --version, --digests, and --help imply --husth */ ++ /* --version, --digests, and --help imply --hush */ + if (!strcmp(cl->key, "--version") || !strcmp(cl->key, "--digests") || + !strcmp(cl->key, "--list-torrc-options") || ++ !strcmp(cl->key, "--library-versions") || + !strcmp(cl->key, "-h") || !strcmp(cl->key, "--help")) + quiet = 1; + } + config_free_lines(opts); + config_free_lines(cmdline_opts); } + /* give it somewhere to log to initially */ switch (quiet) { case 2: [View Less]

1 0

[tor/master] Fixed leak and added minor documentation for #6384.
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit b539b372058613b94ef31073de6595ac5d882fd1 Author: Kevin Butler <haqkrs(a)gmail.com> Date: Wed Sep 4 02:56:06 2013 +0100 Fixed leak and added minor documentation for #6384. --- src/common/crypto.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 5be3327..c83a562 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -195,6 +195,9 @@ try_load_engine(const char *path, const char *engine) }… [View More]

1 0

[tor/master] Whoops; make or_state_validate conform to validate_fn_t.
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit ccbf1cfacde2327505afb69cb5443facb4065544 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 2 15:00:09 2013 -0400 Whoops; make or_state_validate conform to validate_fn_t. Bugfix on 1293835440dd4debf6fbfc66e755d9b9384aa362, which implemented 6752: Not in any released tor. --- src/or/statefile.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/src/or/statefile.c b/src/or/statefile.c index db9091c.… [View More].8ab0476 100644 --- a/src/or/statefile.c +++ b/src/or/statefile.c @@ -91,8 +91,11 @@ static config_var_t state_vars_[] = { #undef VAR #undef V -static int or_state_validate(or_state_t *old_options, or_state_t *options, - int from_setconf, char **msg); +static int or_state_validate(or_state_t *state, char **msg); + +static int or_state_validate_cb(void *old_options, void *options, + void *default_options, + int from_setconf, char **msg); /** Magic value for or_state_t. */ #define OR_STATE_MAGIC 0x57A73f57 @@ -110,7 +113,7 @@ static const config_format_t state_format = { STRUCT_OFFSET(or_state_t, magic_), state_abbrevs_, state_vars_, - (validate_fn_t)or_state_validate, + or_state_validate_cb, &state_extra_var, }; @@ -195,21 +198,27 @@ validate_transports_in_state(or_state_t *state) return 0; } -/** Return 0 if every setting in state is reasonable, and a - * permissible transition from old_state. Else warn and return -1. - * Should have no side effects, except for normalizing the contents of - * state. - */ -/* XXX from_setconf is here because of bug 238 */ static int -or_state_validate(or_state_t *old_state, or_state_t *state, - int from_setconf, char **msg) +or_state_validate_cb(void *old_state, void *state, void *default_state, + int from_setconf, char **msg) { /* We don't use these; only options do. Still, we need to match that * signature. */ (void) from_setconf; + (void) default_state; (void) old_state; + return or_state_validate(state, msg); +} + +/** Return 0 if every setting in state is reasonable, and a + * permissible transition from old_state. Else warn and return -1. + * Should have no side effects, except for normalizing the contents of + * state. + */ +static int +or_state_validate(or_state_t *state, char **msg) +{ if (entry_guards_parse_state(state, 0, msg)<0) return -1; @@ -324,7 +333,7 @@ or_state_load(void) } } - if (!badstate && or_state_validate(NULL, new_state, 1, &errmsg) < 0) + if (!badstate && or_state_validate(new_state, &errmsg) < 0) badstate = 1; if (errmsg) { [View Less]

1 0

[tor/master] Added --library-versions flag to print the compile time and runtime versions of libevent, openssl and zlib. Partially implements #6384.
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit 6e17fa6d7ba57b990dd929e07969d35dc82fc46b Author: Kevin Butler <haqkrs(a)gmail.com> Date: Sun Sep 1 17:38:01 2013 +0100 Added --library-versions flag to print the compile time and runtime versions of libevent, openssl and zlib. Partially implements #6384. --- changes/bug6384 | 2 ++ src/common/compat_libevent.c | 8 ++++++++ src/common/compat_libevent.h | 1 + src/common/crypto.c | 41 ++++++++++++++++++++++++++++------------- src/common/… [View More]crypto.h | 1 + src/common/torgzip.c | 16 ++++++++++++++++ src/common/torgzip.h | 6 ++++++ src/or/config.c | 18 ++++++++++++++++++ src/or/main.c | 9 ++++++--- 9 files changed, 86 insertions(+), 16 deletions(-) diff --git a/changes/bug6384 b/changes/bug6384 new file mode 100644 index 0000000..c0e8446 --- /dev/null +++ b/changes/bug6384 @@ -0,0 +1,2 @@ + o Minor features: + - Add support for `--library-versions` flag. Implements ticket #6384. diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 200a7c6..4d0fff8 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -415,6 +415,14 @@ tor_check_libevent_version(const char *m, int server, #define HEADER_VERSION _EVENT_VERSION #endif +/** Return a string representation of the version of Libevent that was used +* at compilation time. */ +const char * +tor_libevent_get_header_version_str(void) +{ + return HEADER_VERSION; +} + /** See whether the headers we were built against differ from the library we * linked against so much that we're likely to crash. If so, warn the * user. */ diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h index 2472e2c..fda8733 100644 --- a/src/common/compat_libevent.h +++ b/src/common/compat_libevent.h @@ -78,6 +78,7 @@ void tor_check_libevent_version(const char *m, int server, const char **badness_out); void tor_check_libevent_header_compatibility(void); const char *tor_libevent_get_version_str(void); +const char *tor_libevent_get_header_version_str(void); #ifdef USE_BUFFEREVENTS const struct timeval *tor_libevent_get_one_tick_timeout(void); diff --git a/src/common/crypto.c b/src/common/crypto.c index 6f1a0bc..5be3327 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -195,6 +195,24 @@ try_load_engine(const char *path, const char *engine) } #endif +static char * +parse_openssl_version_str(const char *raw_version) +{ + const char *end_of_version = NULL; + /* The output should be something like "OpenSSL 1.0.0b 10 May 2012. Let's + trim that down. */ + if (!strcmpstart(raw_version, "OpenSSL ")) { + raw_version += strlen("OpenSSL "); + end_of_version = strchr(raw_version, ' '); + } + + if (end_of_version) + return tor_strndup(raw_version, + end_of_version-raw_version); + else + return tor_strdup(raw_version); +} + static char *crypto_openssl_version_str = NULL; /* Return a human-readable version of the run-time openssl version number. */ const char * @@ -202,23 +220,20 @@ crypto_openssl_get_version_str(void) { if (crypto_openssl_version_str == NULL) { const char *raw_version = SSLeay_version(SSLEAY_VERSION); - const char *end_of_version = NULL; - /* The output should be something like "OpenSSL 1.0.0b 10 May 2012. Let's - trim that down. */ - if (!strcmpstart(raw_version, "OpenSSL ")) { - raw_version += strlen("OpenSSL "); - end_of_version = strchr(raw_version, ' '); - } - - if (end_of_version) - crypto_openssl_version_str = tor_strndup(raw_version, - end_of_version-raw_version); - else - crypto_openssl_version_str = tor_strdup(raw_version); + crypto_openssl_version_str = parse_openssl_version_str(raw_version); } return crypto_openssl_version_str; } +/* Return a human-readable version of the compile-time openssl version +* number. */ +const char * +crypto_openssl_get_header_version_str(void) +{ + //return OPENSSL_VERSION_TEXT; + return parse_openssl_version_str(OPENSSL_VERSION_TEXT); +} + /** Initialize the crypto library. Return 0 on success, -1 on failure. */ int diff --git a/src/common/crypto.h b/src/common/crypto.h index 2750ed8..6ce3697 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -109,6 +109,7 @@ typedef struct crypto_dh_t crypto_dh_t; /* global state */ const char * crypto_openssl_get_version_str(void); +const char * crypto_openssl_get_header_version_str(void); int crypto_global_init(int hardwareAccel, const char *accelName, const char *accelPath); diff --git a/src/common/torgzip.c b/src/common/torgzip.c index 4328c63..15451ee 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -68,6 +68,22 @@ is_gzip_supported(void) return gzip_is_supported; } +/** Return a string representation of the version of the currently running + * version of zlib. */ +const char * +tor_zlib_get_version_str(void) +{ + return zlibVersion(); +} + +/** Return a string representation of the version of the version of zlib +* used at compilation. */ +const char * +tor_zlib_get_header_version_str(void) +{ + return ZLIB_VERSION; +} + /** Return the 'bits' value to tell zlib to use method.*/ static INLINE int method_bits(compress_method_t method) diff --git a/src/common/torgzip.h b/src/common/torgzip.h index be10164..5db03fe 100644 --- a/src/common/torgzip.h +++ b/src/common/torgzip.h @@ -32,6 +32,12 @@ tor_gzip_uncompress(char **out, size_t *out_len, int is_gzip_supported(void); +const char * +tor_zlib_get_version_str(void); + +const char * +tor_zlib_get_header_version_str(void); + compress_method_t detect_compression_method(const char *in, size_t in_len); /** Return values from tor_zlib_process; see that function's documentation for diff --git a/src/or/config.c b/src/or/config.c index 657bc60..b00f0d6 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -46,6 +46,7 @@ #include "statefile.h" #include "transports.h" #include "ext_orport.h" +#include "torgzip.h" #ifdef _WIN32 #include <shlobj.h> #endif @@ -3816,6 +3817,7 @@ options_init_from_torrc(int argc, char **argv) printf("Tor version %s.\n",get_version()); exit(0); } + if (argc > 1 && (!strcmp(argv[1],"--digests"))) { printf("Tor version %s.\n",get_version()); printf("%s", libor_get_digests()); @@ -3823,6 +3825,22 @@ options_init_from_torrc(int argc, char **argv) exit(0); } + if (argc > 1 && (!strcmp(argv[1],"--library-versions"))) { + printf("Tor version %s. \n", get_version()); + printf("Library versions\tCompiled\t\tRuntime\n"); + printf("Libevent\t\t%-15s\t\t%s\n", + tor_libevent_get_header_version_str(), + tor_libevent_get_version_str()); + printf("OpenSSL \t\t%-15s\t\t%s\n", + crypto_openssl_get_header_version_str(), + crypto_openssl_get_version_str()); + printf("Zlib \t\t%-15s\t\t%s\n", + tor_zlib_get_header_version_str(), + tor_zlib_get_version_str()); + //TODO: Hex versions? + exit(0); + } + /* Go through command-line variables */ if (!global_cmdline_options) { /* Or we could redo the list every time we pass this place. diff --git a/src/or/main.c b/src/or/main.c index 33e1c64..2d6ca74 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2343,6 +2343,8 @@ tor_init(int argc, char *argv[]) /* --version implies --quiet */ if (!strcmp(argv[i], "--version")) quiet = 2; + if (!strcmp(argv[i], "--library-versions")) + quiet = 2; } /* give it somewhere to log to initially */ switch (quiet) { @@ -2365,11 +2367,12 @@ tor_init(int argc, char *argv[]) #else ""; #endif - log_notice(LD_GENERAL, "Tor v%s %srunning on %s with Libevent %s " - "and OpenSSL %s.", version, bev_str, + log_notice(LD_GENERAL, "Tor v%s %srunning on %s with Libevent %s, " + "OpenSSL %s and Zlib %s.", version, bev_str, get_uname(), tor_libevent_get_version_str(), - crypto_openssl_get_version_str()); + crypto_openssl_get_version_str(), + tor_zlib_get_version_str()); log_notice(LD_GENERAL, "Tor can't help you if you use it wrong! " "Learn how to be safe at " [View Less]

1 0

[tor/master] Fix a windows compilation warning from sandboxing branch
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit f4db0f429a47be9ab5f555333a0031fa67a2728a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 13 12:43:18 2013 -0400 Fix a windows compilation warning from sandboxing branch --- src/common/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/util.c b/src/common/util.c index 02c51a4..a45011f 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3040,7 +3040,6 @@ smartlist_t * tor_listdir(const char *dirname) { … [View More]

1 0

[tor/master] Add '--digests' to "that which implies --hush."
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit a6cad4db7063885aee2eceea7c481bc7583e1a4f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 26 14:32:56 2013 -0400 Add '--digests' to "that which implies --hush." And have these various commandline options imply "hush", not "quiet", since we like to see warnings. --- src/or/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 22519f0..598d099 100644 --- a/src/or/main.c +++ b/src/or/… [View More]

1 0