May 2014 - tor-commits - lists.torproject.org

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 12 May '14

12 May '14

commit 25f974472d927b8791b8d2f96a9099687e3561ae Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 12 19:45:09 2014 +0000 Update translations for torcheck --- uk/torcheck.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/uk/torcheck.po b/uk/torcheck.po index 0a74848..2311bc7 100644 --- a/uk/torcheck.po +++ b/uk/torcheck.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 08:21+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-12 19:25+0000\n" +"Last-Translator: LinuxChata\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,7 +26,7 @@ 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 "Будь ласка, скористуйтесь посиланням на <a href=\"https://www.torproject.org/\">TorProject</a> аби більше дізнатися про безпечне користування браузером Tor. Тепер ви можете користуватись Інтернетом анонімно." +msgstr "Будь ласка, скористайтесь посиланням <a href=\"https://www.torproject.org/\">TorProject</a> аби більше дізнатися про безпечне користування браузером Tor. Тепер Ви можете користуватись Інтернетом анонімно." msgid "There is a security update available for the Tor Browser Bundle." msgstr "Доступно оновлення безпеки для Tor Browser Bundle." @@ -44,10 +44,10 @@ 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 "Якщо ви збираєтеся використовувати Tor клієнт, будь ласка, зайдіть на <a href=\"https://www.torproject.org/\">Tor website</a> і, зокрема <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">інструкції з налаштування клієнта Tor</a>." +msgstr "Якщо Ви збираєтеся використовувати Tor клієнт, будь ласка, зайдіть на <a href=\"https://www.torproject.org/\">Tor website</a> і, зокрема <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">інструкції з налаштування клієнта Tor</a>." msgid "Sorry, your query failed or an unexpected response was received." -msgstr "Вибачте, ваш запит невдалий або отримана неочікувана відповідь." +msgstr "Вибачте, Ваш запит невдалий або отримана неочікувана відповідь." msgid "" "A temporary service outage prevents us from determining if your source IP " @@ -61,7 +61,7 @@ msgid "Are you using Tor?" msgstr "Ви використовуєте Tor?" msgid "This page is also available in the following languages:" -msgstr "Ця сторінка також доступна на наступних мовах:" +msgstr "Ця сторінка також доступна наступними мовами:" msgid "For more information about this exit relay, see:" msgstr "Для отримання додаткової інформації про даний вихідний вузол, перегляньте:" @@ -96,4 +96,4 @@ msgid "JavaScript is disabled." msgstr "JavaScript вимкнений." msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "" +msgstr "Однак, це здається не Tor Browser Bundle."

1 0

[tor/master] Log an error reply from tor-fw-helper correctly.
by nickm＠torproject.org 12 May '14

12 May '14

commit b5e142cb1ba2dcdcf0c7586cdb3bd1efa2bd78b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 6 21:34:40 2014 -0400 Log an error reply from tor-fw-helper correctly. Fix for bug 9781; bugfix on cd05f35d2cdf50 in 0.2.4.2-alpha. --- changes/bug9781 | 5 +++++ src/common/util.c | 21 +++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/changes/bug9781 b/changes/bug9781 new file mode 100644 index 0000000..0a3c557 --- /dev/null +++ b/changes/bug9781 @@ -0,0 +1,5 @@ + o Minor bugfixes (tor-fw-helper): + + - Give a correct log message when tor-fw-helper fails to launch. + (Previously, we would say something like "tor-fw-helper sent us a + string we could not parse".) Fixes bug 9781; bugfix on 0.2.4.2-alpha. diff --git a/src/common/util.c b/src/common/util.c index d82677d..a27fe4b 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -4789,7 +4789,7 @@ get_string_from_pipe(FILE *stream, char *buf_out, size_t count) /** Parse a <b>line</b> from tor-fw-helper and issue an appropriate * log message to our user. */ static void -handle_fw_helper_line(const char *line) +handle_fw_helper_line(const char *executable, const char *line) { smartlist_t *tokens = smartlist_new(); char *message = NULL; @@ -4800,6 +4800,19 @@ handle_fw_helper_line(const char *line) int port = 0; int success = 0; + if (strcmpstart(line, SPAWN_ERROR_MESSAGE) == 0) { + /* We need to check for SPAWN_ERROR_MESSAGE again here, since it's + * possible that it got sent after we tried to read it in log_from_pipe. + * + * XXX Ideally, we should be using one of stdout/stderr for the real + * output, and one for the output of the startup code. We used to do that + * before cd05f35d2c. + */ + int child_status; + log_portfw_spawn_error_message(line, executable, &child_status); + goto done; + } + smartlist_split_string(tokens, line, NULL, SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); @@ -4879,7 +4892,7 @@ handle_fw_helper_line(const char *line) /** Read what tor-fw-helper has to say in its stdout and handle it * appropriately */ static int -handle_fw_helper_output(process_handle_t *process_handle) +handle_fw_helper_output(const char *executable, process_handle_t *process_handle) { smartlist_t *fw_helper_output = NULL; enum stream_status stream_status = 0; @@ -4894,7 +4907,7 @@ handle_fw_helper_output(process_handle_t *process_handle) /* Handle the lines we got: */ SMARTLIST_FOREACH_BEGIN(fw_helper_output, char *, line) { - handle_fw_helper_line(line); + handle_fw_helper_line(executable, line); tor_free(line); } SMARTLIST_FOREACH_END(line); @@ -5009,7 +5022,7 @@ tor_check_port_forwarding(const char *filename, stderr_status = log_from_pipe(child_handle->stderr_handle, LOG_INFO, filename, &retval); #endif - if (handle_fw_helper_output(child_handle) < 0) { + if (handle_fw_helper_output(filename, child_handle) < 0) { log_warn(LD_GENERAL, "Failed to handle fw helper output."); stdout_status = -1; retval = -1;

1 0

[tor/master] Split portfw-error-logging code into a new function.
by nickm＠torproject.org 12 May '14

12 May '14

commit 1adc98b9b55a28a6785a6faf8e5b3369981d8dbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 6 21:22:40 2014 -0400 Split portfw-error-logging code into a new function. No code has changed; only moved. Part of a fix for 9781. --- src/common/util.c | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 6524be3..d82677d 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -4540,6 +4540,30 @@ stream_status_to_string(enum stream_status stream_status) } } +/* DOCDOC */ +static void +log_portfw_spawn_error_message(const char *buf, + const char *executable, int *child_status) +{ + /* Parse error message */ + int retval, child_state, saved_errno; + retval = tor_sscanf(buf, SPAWN_ERROR_MESSAGE "%x/%x", + &child_state, &saved_errno); + if (retval == 2) { + log_warn(LD_GENERAL, + "Failed to start child process \"%s\" in state %d: %s", + executable, child_state, strerror(saved_errno)); + if (child_status) + *child_status = 1; + } else { + /* Failed to parse message from child process, log it as a + warning */ + log_warn(LD_GENERAL, + "Unexpected message from port forwarding helper \"%s\": %s", + executable, buf); + } +} + #ifdef _WIN32 /** Return a smartlist containing lines outputted from @@ -4687,23 +4711,7 @@ log_from_pipe(FILE *stream, int severity, const char *executable, /* Check if buf starts with SPAWN_ERROR_MESSAGE */ if (strcmpstart(buf, SPAWN_ERROR_MESSAGE) == 0) { - /* Parse error message */ - int retval, child_state, saved_errno; - retval = tor_sscanf(buf, SPAWN_ERROR_MESSAGE "%x/%x", - &child_state, &saved_errno); - if (retval == 2) { - log_warn(LD_GENERAL, - "Failed to start child process \"%s\" in state %d: %s", - executable, child_state, strerror(saved_errno)); - if (child_status) - *child_status = 1; - } else { - /* Failed to parse message from child process, log it as a - warning */ - log_warn(LD_GENERAL, - "Unexpected message from port forwarding helper \"%s\": %s", - executable, buf); - } + log_portfw_spawn_error_message(buf, executable, child_status); } else { log_fn(severity, LD_GENERAL, "Port forwarding helper says: %s", buf); }

1 0

[tor/master] Merge branch 'bug9781_v2'
by nickm＠torproject.org 12 May '14

12 May '14

commit 585582fc8c77a19981af2887e0a9d7691c0a4845 Merge: 75e850e b5e142c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 12 13:35:22 2014 -0400 Merge branch 'bug9781_v2' changes/bug9781 | 5 +++++ src/common/util.c | 63 +++++++++++++++++++++++++++++++++++------------------ 2 files changed, 47 insertions(+), 21 deletions(-)

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 12 May '14

12 May '14

commit 2abf2d9335f3f719f45428d6191c2ee53dde42ca Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 12 17:15:22 2014 +0000 Update translations for torcheck_completed --- it/torcheck.po | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/it/torcheck.po b/it/torcheck.po index 4e2af69..8f1e264 100644 --- a/it/torcheck.po +++ b/it/torcheck.po @@ -9,14 +9,15 @@ # ironbishop <ironbishop(a)fsfe.org>, 2011 # Jaggions <jacopo.jannone(a)gmail.com>, 2014 # Jaggions <jacopo.jannone(a)gmail.com>, 2014 +# ilTerribile <nicholas.carluccio(a)hotmail.it>, 2014 # Ruggero Tonelli <>, 2012 # chap <chap(a)anche.no>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-04-29 09:58+0000\n" -"Last-Translator: Francesca Ciceri <madamezou(a)zouish.org>\n" +"PO-Revision-Date: 2014-05-12 17:00+0000\n" +"Last-Translator: ilTerribile <nicholas.carluccio(a)hotmail.it>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -100,3 +101,6 @@ msgstr "JavaScript è abilitato." msgid "JavaScript is disabled." msgstr "JavaScript è disabilitato." + +msgid "However, it does not appear to be the Tor Browser Bundle." +msgstr "Tuttavia, non sembra essere il Tor Browser Bundle."

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 12 May '14

12 May '14

commit 317e215460171961e832e15ce927cc9a88682797 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 12 17:15:17 2014 +0000 Update translations for torcheck --- it/torcheck.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/it/torcheck.po b/it/torcheck.po index 7a9c922..8f1e264 100644 --- a/it/torcheck.po +++ b/it/torcheck.po @@ -9,14 +9,15 @@ # ironbishop <ironbishop(a)fsfe.org>, 2011 # Jaggions <jacopo.jannone(a)gmail.com>, 2014 # Jaggions <jacopo.jannone(a)gmail.com>, 2014 +# ilTerribile <nicholas.carluccio(a)hotmail.it>, 2014 # Ruggero Tonelli <>, 2012 # chap <chap(a)anche.no>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 08:21+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-12 17:00+0000\n" +"Last-Translator: ilTerribile <nicholas.carluccio(a)hotmail.it>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -102,4 +103,4 @@ msgid "JavaScript is disabled." msgstr "JavaScript è disabilitato." msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "" +msgstr "Tuttavia, non sembra essere il Tor Browser Bundle."

1 0

r26774: {website} Removed one FAQ entry. (website/trunk/docs/en)
by Matt Pagan 12 May '14

12 May '14

Author: mttp Date: 2014-05-12 16:40:43 +0000 (Mon, 12 May 2014) New Revision: 26774 Modified: website/trunk/docs/en/faq.wml Log: Removed one FAQ entry. Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2014-05-09 14:13:40 UTC (rev 26773) +++ website/trunk/docs/en/faq.wml 2014-05-12 16:40:43 UTC (rev 26774) @@ -139,8 +139,6 @@ <li><a href="#DoesntWork">Tor is running, but it's not working correctly.</a></li> <li><a href="#TorCrash">My Tor keeps crashing.</a></li> - <li><a href="#VidaliaPassword">Tor/Vidalia prompts for a password at - start.</a></li> <li><a href="#ChooseEntryExit">Can I control which nodes (or country) are used for entry/exit?</a></li> @@ -560,7 +558,7 @@ href="<page projects/torbrowser>">Tor Browser</a>. This includes <a href="https://www.mozilla.org/en-US/firefox/organizations/">Firefox Extended Support Release</a>, and the NoScript and HTTPS-Everywhere - extensions. You will need to follow the licensefor those programs as + extensions. You will need to follow the license for those programs as well. Both of those Firefox extensions are distributed under the <a href="https://www.fsf.org/licensing/licenses/gpl.html">GNU General Public License</a>, while Firefox ESR is released under the Mozilla Public @@ -2031,64 +2029,6 @@ <hr /> -<a id="VidaliaPassword"></a> -<h3><a class="anchor" href="#VidaliaPassword">Tor/Vidalia prompts for a -password at start.</a></h3> - -<p> -Vidalia interacts with the Tor software via Tor's "control port". The -control port lets Vidalia receive status updates from Tor, request a new -identity, configure Tor's settings, etc. Each time Vidalia starts Tor, -Vidalia sets a random password for Tor's control port to prevent other -applications from also connecting to the control port and potentially -compromising your anonymity. -</p> - -<p> -Usually this process of generating and setting a random control password -happens in the background. There are three common situations, though, -where Vidalia may prompt you for a password: -</p> - -<ol> -<li>You're already running Vidalia and Tor. For example, this situation -can happen if you installed the Vidalia bundle and now you're trying to -run the Tor Browser Bundle. In that case, you'll need to close the old -Vidalia and Tor before you can run this one. -</li> -<li>Vidalia crashed, but left Tor running with the last known random -password. After you restart Vidalia, it generates a new random password, -but Vidalia can't talk to Tor, because the random passwords are -different. -<br /> -If the dialog that prompts you for a control password has a Reset -button, -you can click the button and Vidalia will restart Tor with a new random -control password. -<br /> -If you do not see a Reset button, or if Vidalia is unable to restart -Tor for you, you can still fix the problem manually. Simply go into your -process or task manager, and terminate the Tor process. Then use Vidalia -to restart Tor and all will work again. -</li> -<li>You had previously set Tor to run as a Windows NT service. When Tor -is set to -run as a service, it starts up when the system boots. If you configured -Tor to start as a service through Vidalia, a random password was set -and saved in Tor. When you reboot, Tor starts up and uses the random -password it saved. You login and start up Vidalia. Vidalia attempts to -talk to the already running Tor. Vidalia generates a random password, -but it is different than the saved password in the Tor service. -<br /> -You need to reconfigure Tor to not be a service. See the FAQ entry on -<a href="#NTservice">running Tor as a -Windows NT service</a> -for more information on how to remove the Tor service. -</li> -</ol> - - <hr> - <a id="ChooseEntryExit"></a> <h3><a class="anchor" href="#ChooseEntryExit">Can I control which nodes (or country) are used for entry/exit?</a></h3>

1 0

[tor/master] changes file for gisle vanem's MSVC fix
by nickm＠torproject.org 12 May '14

12 May '14

commit 75e850efe6d5c6d0de7e99f71671d2983afcad4c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 12 11:49:17 2014 -0400 changes file for gisle vanem's MSVC fix --- changes/msvc_fix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/msvc_fix b/changes/msvc_fix new file mode 100644 index 0000000..6d4531b --- /dev/null +++ b/changes/msvc_fix @@ -0,0 +1,3 @@ + o Minor bugfixes (build): + - Fix compilation of test_status.c when building with MVSC. + Bugfix on 0.2.5.4-alpha. Patch from Gisle Vanem.

1 0

[tor/master] Fix compilation of test_status.c with MSVC
by nickm＠torproject.org 12 May '14

12 May '14

commit c7ab8587c9167526a313c84c6f5f4375dd36b600 Author: Gisle Vanem <gvanem(a)yahoo.no> Date: Mon May 12 00:34:06 2014 -0400 Fix compilation of test_status.c with MSVC --- src/common/torlog.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/torlog.h b/src/common/torlog.h index 4493b25..f6ddca5 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -156,9 +156,9 @@ void tor_log_err_sigsafe(const char *m, ...); int tor_log_get_sigsafe_err_fds(const int **out); void tor_log_update_sigsafe_err_fds(void); -#if defined(__GNUC__) || defined(RUNNING_DOXYGEN) extern int log_global_min_severity_; +#if defined(__GNUC__) || defined(RUNNING_DOXYGEN) void log_fn_(int severity, log_domain_mask_t domain, const char *funcname, const char *format, ...) CHECK_PRINTF(4,5);

1 0

[stem/master] Colorizing header banner
by atagar＠torproject.org 12 May '14

12 May '14

commit 1e56973e4cf251b7a29429435b1b97bcf353dbdc Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 11 16:09:23 2014 -0700 Colorizing header banner Colorizing our prompt's initial output, with bolding to better emphasize the examples. --- stem/interpretor/__init__.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/stem/interpretor/__init__.py b/stem/interpretor/__init__.py index 643767d..0e4492e 100644 --- a/stem/interpretor/__init__.py +++ b/stem/interpretor/__init__.py @@ -30,6 +30,8 @@ PROMPT = format('>>> ', Color.GREEN, Attr.BOLD) + RESET * 10 STANDARD_OUTPUT = (Color.BLUE, ) BOLD_OUTPUT = (Color.BLUE, Attr.BOLD) +HEADER_OUTPUT = (Color.GREEN, ) +HEADER_BOLD_OUTPUT = (Color.GREEN, Attr.BOLD) ERROR_OUTPUT = (Attr.BOLD, Color.RED) settings_path = os.path.join(os.path.dirname(__file__), 'settings.cfg') @@ -66,10 +68,10 @@ def main(): if not is_tor_running: if not stem.util.system.is_available('tor'): - print msg('msg.tor_unavailable') + print format(msg('msg.tor_unavailable'), *ERROR_OUTPUT) sys.exit(1) else: - print msg('msg.starting_tor') + print format(msg('msg.starting_tor'), *HEADER_OUTPUT) stem.process.launch_tor_with_config( config = { @@ -101,7 +103,12 @@ def main(): readline.set_completer_delims('\n') interpretor = stem.interpretor.commands.ControlInterpretor(controller) - print msg('msg.startup_banner') + + for line in msg('msg.startup_banner').splitlines(): + line_format = HEADER_BOLD_OUTPUT if line.startswith(' ') else HEADER_OUTPUT + print format(line, *line_format) + + print while True: try:

1 0