December 2018 - tor-commits - lists.torproject.org

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 14 Dec '18

14 Dec '18

commit cec498f74075c52f43bc7ca769d02c8568077db3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 14 09:19:34 2018 +0000 Update translations for support-portal --- contents+he.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+he.po b/contents+he.po index 0227a7613..224f6a292 100644 --- a/contents+he.po +++ b/contents+he.po @@ -1077,7 +1077,7 @@ msgstr "הסרת דפדפן Tor מהמערכת שלך היא פשוטה:" #: http//localhost/tbb/uninstall-tor-browser/ #: (content/tbb/tbb-28/contents+en.lrquestion.description) msgid "* Locate your Tor Browser folder or application." -msgstr "" +msgstr "* אתר את התיקייה או היישום של דפדפן Tor שלך." #: http//localhost/tbb/uninstall-tor-browser/ #: (content/tbb/tbb-28/contents+en.lrquestion.description) @@ -1102,7 +1102,7 @@ msgstr "* מחק את התיקייה או היישום של Tor." #: http//localhost/tbb/uninstall-tor-browser/ #: (content/tbb/tbb-28/contents+en.lrquestion.description) msgid "* Empty your Trash." -msgstr "" +msgstr "* רוקן את האשפה שלך" #: http//localhost/tbb/uninstall-tor-browser/ #: (content/tbb/tbb-28/contents+en.lrquestion.description)

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 14 Dec '18

14 Dec '18

commit 27602b68676580ce8811249c1c4285faaf83f8cc Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 14 07:17:28 2018 +0000 Update translations for tbmanual-contentspot --- contents+ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index dcebfff47..05ac2a3b8 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -220,7 +220,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) msgid "###### New Tor circuit for this site" -msgstr "دائرة تور جديدة لهذا الموقع#####" +msgstr "##### دائرة تور جديدة لهذا الموقع" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) @@ -1830,7 +1830,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.lrtopic.body) msgid "##### Known issues" -msgstr "مشاكل معروفة#####" +msgstr "##### مشاكل معروفة" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.lrtopic.body)

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 14 Dec '18

14 Dec '18

commit 432705a468546efe8ccc8abec403d4b9254feec9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 14 03:46:31 2018 +0000 Update translations for tails-greeter-2 --- gu/gu.po | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gu/gu.po b/gu/gu.po index a0c4eceaa..e90a7ba84 100644 --- a/gu/gu.po +++ b/gu/gu.po @@ -3,13 +3,18 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # +# Translators: +# runasand <inactive+runasand(a)transifex.com>, 2016 +# Michael Hathi <numerativetech(a)gmail.com>, 2018 +# Drashti Kaushik <drashtipandya37(a)gmail.com>, 2018 +# #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-04 09:46+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2016-11-18 21:29+0000\n" "Last-Translator: Drashti Kaushik <drashtipandya37(a)gmail.com>, 2018\n" "Language-Team: Gujarati (https://www.transifex.com/otf/teams/1519/gu/)\n" "MIME-Version: 1.0\n" @@ -60,11 +65,11 @@ msgstr "" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:12 msgid "Microsoft Windows 10 camouflage" -msgstr "" +msgstr "Microsoft Windows 10 camouflage" #: ../data/greeter.ui.h:13 msgid "MAC Address Spoofing" -msgstr "" +msgstr "MAC Address સ્પોફિંગ" #: ../data/greeter.ui.h:14 msgid "" @@ -133,7 +138,7 @@ msgstr "_Time Zone" #: ../data/greeter.ui.h:29 msgid "Encrypted _Persistent Storage" -msgstr "" +msgstr "એનક્રિપ્ટ થયેલ સતત સંગ્રહ" #: ../data/greeter.ui.h:30 msgid "Show Passphrase" @@ -141,7 +146,7 @@ msgstr "" #: ../data/greeter.ui.h:31 msgid "Configure Persistent Storage" -msgstr "" +msgstr "સતત સ્ટોરેજ રૂપરેખાંકિત કરો" #: ../data/greeter.ui.h:32 msgid "Enter your passphrase to unlock the persistent storage" @@ -247,7 +252,7 @@ msgstr "અનલૉક થઇ રહ્યું..." #: ../tailsgreeter/gui.py:594 msgid "Additional Settings" -msgstr "" +msgstr "વધારાની સેટિંગ્સ" #: ../tailsgreeter/gui.py:602 msgid "Cancel" @@ -273,7 +278,7 @@ msgstr "" #. Gtk translation) #: ../tailsgreeter/language.py:136 msgid "default:LTR" -msgstr "" +msgstr "મૂળભૂત:LTR" #: ../tailsgreeter/persistence.py:91 #, python-brace-format

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 14 Dec '18

14 Dec '18

commit f8dac5c900856494867996f60da848b0111aad35 Merge: 69264f96f 94a799815 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 13 19:01:29 2018 -0500 Merge branch 'maint-0.3.5' changes/ticket28731 | 4 ++++ src/feature/control/control_bootstrap.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --cc src/feature/control/control_bootstrap.c index 7299757f9,000000000..0756e208e mode 100644,000000..100644 --- a/src/feature/control/control_bootstrap.c +++ b/src/feature/control/control_bootstrap.c @@@ -1,358 -1,0 +1,358 @@@ +/* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file control_bootstrap.c + * \brief Provide bootstrap progress events for the control port. + */ +#include "core/or/or.h" + +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_or.h" +#include "core/or/connection_st.h" +#include "core/or/or_connection_st.h" +#include "core/or/reasons.h" +#include "feature/control/control.h" +#include "feature/hibernate/hibernate.h" +#include "lib/malloc/malloc.h" + +/** A sufficiently large size to record the last bootstrap phase string. */ +#define BOOTSTRAP_MSG_LEN 1024 + +/** What was the last bootstrap phase message we sent? We keep track + * of this so we can respond to getinfo status/bootstrap-phase queries. */ +static char last_sent_bootstrap_message[BOOTSTRAP_MSG_LEN]; + +/** Table to convert bootstrap statuses to strings. */ +static const struct { + bootstrap_status_t status; + const char *tag; + const char *summary; +} boot_to_str_tab[] = { + { BOOTSTRAP_STATUS_UNDEF, "undef", "Undefined" }, + { BOOTSTRAP_STATUS_STARTING, "starting", "Starting" }, + { BOOTSTRAP_STATUS_CONN_DIR, "conn_dir", "Connecting to directory server" }, + { BOOTSTRAP_STATUS_HANDSHAKE, "status_handshake", "Finishing handshake" }, + { BOOTSTRAP_STATUS_HANDSHAKE_DIR, "handshake_dir", + "Finishing handshake with directory server" }, + { BOOTSTRAP_STATUS_ONEHOP_CREATE, "onehop_create", + "Establishing an encrypted directory connection" }, + { BOOTSTRAP_STATUS_REQUESTING_STATUS, "requesting_status", + "Asking for networkstatus consensus" }, + { BOOTSTRAP_STATUS_LOADING_STATUS, "loading_status", + "Loading networkstatus consensus" }, + { BOOTSTRAP_STATUS_LOADING_KEYS, "loading_keys", + "Loading authority key certs" }, + { BOOTSTRAP_STATUS_REQUESTING_DESCRIPTORS, "requesting_descriptors", + "Asking for relay descriptors" }, + { BOOTSTRAP_STATUS_LOADING_DESCRIPTORS, "loading_descriptors", + "Loading relay descriptors" }, + { BOOTSTRAP_STATUS_CONN_OR, "conn_or", "Connecting to the Tor network" }, + { BOOTSTRAP_STATUS_HANDSHAKE_OR, "handshake_or", + "Finishing handshake with first hop" }, + { BOOTSTRAP_STATUS_CIRCUIT_CREATE, "circuit_create", + "Establishing a Tor circuit" }, + { BOOTSTRAP_STATUS_DONE, "done", "Done" }, +}; +#define N_BOOT_TO_STR (sizeof(boot_to_str_tab)/sizeof(boot_to_str_tab[0])) + +/** Convert the name of a bootstrapping phase s into strings + * tag and summary suitable for display by the controller. */ +static int +bootstrap_status_to_string(bootstrap_status_t s, const char **tag, + const char **summary) +{ + for (size_t i = 0; i < N_BOOT_TO_STR; i++) { + if (s == boot_to_str_tab[i].status) { + *tag = boot_to_str_tab[i].tag; + *summary = boot_to_str_tab[i].summary; + return 0; + } + } + + *tag = *summary = "unknown"; + return -1; +} + +/** What percentage through the bootstrap process are we? We remember + * this so we can avoid sending redundant bootstrap status events, and + * so we can guess context for the bootstrap messages which are + * ambiguous. It starts at 'undef', but gets set to 'starting' while + * Tor initializes. */ +static int bootstrap_percent = BOOTSTRAP_STATUS_UNDEF; + +/** Like bootstrap_percent, but only takes on the enumerated values in + * bootstrap_status_t. + */ +static int bootstrap_phase = BOOTSTRAP_STATUS_UNDEF; + +/** As bootstrap_percent, but holds the bootstrapping level at which we last + * logged a NOTICE-level message. We use this, plus BOOTSTRAP_PCT_INCREMENT, + * to avoid flooding the log with a new message every time we get a few more + * microdescriptors */ +static int notice_bootstrap_percent = 0; + +/** How many problems have we had getting to the next bootstrapping phase? + * These include failure to establish a connection to a Tor relay, + * failures to finish the TLS handshake, failures to validate the + * consensus document, etc. */ +static int bootstrap_problems = 0; + +/** We only tell the controller once we've hit a threshold of problems + * for the current phase. */ +#define BOOTSTRAP_PROBLEM_THRESHOLD 10 + +/** When our bootstrapping progress level changes, but our bootstrapping + * status has not advanced, we only log at NOTICE when we have made at least + * this much progress. + */ +#define BOOTSTRAP_PCT_INCREMENT 5 + +/** Do the actual logging and notifications for + * control_event_bootstrap(). Doesn't change any state beyond that. + */ +static void +control_event_bootstrap_core(int loglevel, bootstrap_status_t status, + int progress) +{ + char buf[BOOTSTRAP_MSG_LEN]; + const char *tag, *summary; + + bootstrap_status_to_string(status, &tag, &summary); + /* Locally reset status if there's incremental progress */ + if (progress) + status = progress; + + tor_log(loglevel, LD_CONTROL, - "Bootstrapped %d%%: %s", status, summary); ++ "Bootstrapped %d%% (%s): %s", status, tag, summary); + tor_snprintf(buf, sizeof(buf), + "BOOTSTRAP PROGRESS=%d TAG=%s SUMMARY=\"%s\"", + status, tag, summary); + tor_snprintf(last_sent_bootstrap_message, + sizeof(last_sent_bootstrap_message), + "NOTICE %s", buf); + control_event_client_status(LOG_NOTICE, "%s", buf); +} + +/** Called when Tor has made progress at bootstrapping its directory + * information and initial circuits. + * + * status is the new status, that is, what task we will be doing + * next. progress is zero if we just started this task, else it + * represents progress on the task. + */ +void +control_event_bootstrap(bootstrap_status_t status, int progress) +{ + int loglevel = LOG_NOTICE; + + if (bootstrap_percent == BOOTSTRAP_STATUS_DONE) + return; /* already bootstrapped; nothing to be done here. */ + + /* special case for handshaking status, since our TLS handshaking code + * can't distinguish what the connection is going to be for. */ + if (status == BOOTSTRAP_STATUS_HANDSHAKE) { + if (bootstrap_percent < BOOTSTRAP_STATUS_CONN_OR) { + status = BOOTSTRAP_STATUS_HANDSHAKE_DIR; + } else { + status = BOOTSTRAP_STATUS_HANDSHAKE_OR; + } + } + + if (status <= bootstrap_percent) { + /* If there's no new progress, return early. */ + if (!progress || progress <= bootstrap_percent) + return; + /* Log at INFO if not enough progress happened. */ + if (progress < notice_bootstrap_percent + BOOTSTRAP_PCT_INCREMENT) + loglevel = LOG_INFO; + } + + control_event_bootstrap_core(loglevel, status, progress); + + if (status > bootstrap_percent) { + bootstrap_phase = status; /* new milestone reached */ + bootstrap_percent = status; + } + if (progress > bootstrap_percent) { + /* incremental progress within a milestone */ + bootstrap_percent = progress; + bootstrap_problems = 0; /* Progress! Reset our problem counter. */ + } + if (loglevel == LOG_NOTICE && + bootstrap_percent > notice_bootstrap_percent) { + /* Remember that we gave a notice at this level. */ + notice_bootstrap_percent = bootstrap_percent; + } +} + +/** Flag whether we've opened an OR_CONN yet */ +static int bootstrap_first_orconn = 0; + +/** Like bootstrap_phase, but for (possibly deferred) directory progress */ +static int bootstrap_dir_phase = BOOTSTRAP_STATUS_UNDEF; + +/** Like bootstrap_problems, but for (possibly deferred) directory progress */ +static int bootstrap_dir_progress = BOOTSTRAP_STATUS_UNDEF; + +/** Defer directory info bootstrap events until we have successfully + * completed our first connection to a router. */ +void +control_event_boot_dir(bootstrap_status_t status, int progress) +{ + if (status > bootstrap_dir_progress) { + bootstrap_dir_progress = status; + bootstrap_dir_phase = status; + } + if (progress && progress >= bootstrap_dir_progress) { + bootstrap_dir_progress = progress; + } + + /* Don't report unless we have successfully opened at least one OR_CONN */ + if (!bootstrap_first_orconn) + return; + + control_event_bootstrap(status, progress); +} + +/** Set a flag to allow reporting of directory bootstrap progress. + * (Code that reports completion of an OR_CONN calls this.) Also, + * report directory progress so far. */ +void +control_event_boot_first_orconn(void) +{ + bootstrap_first_orconn = 1; + control_event_bootstrap(bootstrap_dir_phase, bootstrap_dir_progress); +} + +/** Called when Tor has failed to make bootstrapping progress in a way + * that indicates a problem. warn gives a human-readable hint + * as to why, and reason provides a controller-facing short + * tag. conn is the connection that caused this problem and + * can be NULL if a connection cannot be easily identified. + */ +void +control_event_bootstrap_problem(const char *warn, const char *reason, + const connection_t *conn, int dowarn) +{ + int status = bootstrap_percent; + const char *tag = "", *summary = ""; + char buf[BOOTSTRAP_MSG_LEN]; + const char *recommendation = "ignore"; + int severity; + char *or_id = NULL, *hostaddr = NULL; + or_connection_t *or_conn = NULL; + + /* bootstrap_percent must not be in "undefined" state here. */ + tor_assert(status >= 0); + + if (bootstrap_percent == 100) + return; /* already bootstrapped; nothing to be done here. */ + + bootstrap_problems++; + + if (bootstrap_problems >= BOOTSTRAP_PROBLEM_THRESHOLD) + dowarn = 1; + + /* Don't warn about our bootstrapping status if we are hibernating or + * shutting down. */ + if (we_are_hibernating()) + dowarn = 0; + + tor_assert(bootstrap_status_to_string(bootstrap_phase, &tag, &summary) == 0); + + severity = dowarn ? LOG_WARN : LOG_INFO; + + if (dowarn) + recommendation = "warn"; + + if (conn && conn->type == CONN_TYPE_OR) { + /* XXX TO_OR_CONN can't deal with const */ + or_conn = TO_OR_CONN((connection_t *)conn); + or_id = tor_strdup(hex_str(or_conn->identity_digest, DIGEST_LEN)); + } else { + or_id = tor_strdup("?"); + } + + if (conn) + tor_asprintf(&hostaddr, "%s:%d", conn->address, (int)conn->port); + else + hostaddr = tor_strdup("?"); + + log_fn(severity, - LD_CONTROL, "Problem bootstrapping. Stuck at %d%%: %s. (%s; %s; " ++ LD_CONTROL, "Problem bootstrapping. Stuck at %d%% (%s): %s. (%s; %s; " + "count %d; recommendation %s; host %s at %s)", - status, summary, warn, reason, ++ status, tag, summary, warn, reason, + bootstrap_problems, recommendation, + or_id, hostaddr); + + connection_or_report_broken_states(severity, LD_HANDSHAKE); + + tor_snprintf(buf, sizeof(buf), + "BOOTSTRAP PROGRESS=%d TAG=%s SUMMARY=\"%s\" WARNING=\"%s\" REASON=%s " + "COUNT=%d RECOMMENDATION=%s HOSTID=\"%s\" HOSTADDR=\"%s\"", + bootstrap_percent, tag, summary, warn, reason, bootstrap_problems, + recommendation, + or_id, hostaddr); + + tor_snprintf(last_sent_bootstrap_message, + sizeof(last_sent_bootstrap_message), + "WARN %s", buf); + control_event_client_status(LOG_WARN, "%s", buf); + + tor_free(hostaddr); + tor_free(or_id); +} + +/** Called when Tor has failed to make bootstrapping progress in a way + * that indicates a problem. warn gives a hint as to why, and + * reason provides an "or_conn_end_reason" tag. or_conn + * is the connection that caused this problem. + */ +MOCK_IMPL(void, +control_event_bootstrap_prob_or, (const char *warn, int reason, + or_connection_t *or_conn)) +{ + int dowarn = 0; + + if (or_conn->have_noted_bootstrap_problem) + return; + + or_conn->have_noted_bootstrap_problem = 1; + + if (reason == END_OR_CONN_REASON_NO_ROUTE) + dowarn = 1; + + /* If we are using bridges and all our OR connections are now + closed, it means that we totally failed to connect to our + bridges. Throw a warning. */ + if (get_options()->UseBridges && !any_other_active_or_conns(or_conn)) + dowarn = 1; + + control_event_bootstrap_problem(warn, + orconn_end_reason_to_control_string(reason), + TO_CONN(or_conn), dowarn); +} + +/** Return a copy of the last sent bootstrap message. */ +char * +control_event_boot_last_msg(void) +{ + return tor_strdup(last_sent_bootstrap_message); +} + +/** Reset bootstrap tracking state. */ +void +control_event_bootstrap_reset(void) +{ + bootstrap_percent = BOOTSTRAP_STATUS_UNDEF; + bootstrap_phase = BOOTSTRAP_STATUS_UNDEF; + notice_bootstrap_percent = 0; + bootstrap_problems = 0; + bootstrap_first_orconn = 0; + bootstrap_dir_progress = BOOTSTRAP_STATUS_UNDEF; + bootstrap_dir_phase = BOOTSTRAP_STATUS_UNDEF; + memset(last_sent_bootstrap_message, 0, sizeof(last_sent_bootstrap_message)); +}

1 0

[tor/maint-0.3.5] Log bootstrap tag names
by nickm＠torproject.org 14 Dec '18

14 Dec '18

commit 1b855af5e33189d70d74273af03a535c343b63a5 Author: Taylor Yu <catalyst(a)torproject.org> Date: Mon Dec 10 17:22:28 2018 -0600 Log bootstrap tag names Add the bootstrap tag name to the log messages, so people troubleshooting connection problems can look up a symbol instead of a number. Closes ticket 28731. --- changes/ticket28731 | 4 ++++ src/feature/control/control.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/ticket28731 b/changes/ticket28731 new file mode 100644 index 000000000..f8b116cc1 --- /dev/null +++ b/changes/ticket28731 @@ -0,0 +1,4 @@ + o Minor features (bootstrap): + - Add the bootstrap tag name to the log messages, so people + troubleshooting connection problems can look up a symbol instead + of a number. Closes ticket 28731. diff --git a/src/feature/control/control.c b/src/feature/control/control.c index 795902e6f..8208b80c2 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -7153,7 +7153,7 @@ control_event_bootstrap_core(int loglevel, bootstrap_status_t status, status = progress; tor_log(loglevel, LD_CONTROL, - "Bootstrapped %d%%: %s", status, summary); + "Bootstrapped %d%% (%s): %s", status, tag, summary); tor_snprintf(buf, sizeof(buf), "BOOTSTRAP PROGRESS=%d TAG=%s SUMMARY=\"%s\"", status, tag, summary); @@ -7309,9 +7309,9 @@ control_event_bootstrap_problem(const char *warn, const char *reason, hostaddr = tor_strdup("?"); log_fn(severity, - LD_CONTROL, "Problem bootstrapping. Stuck at %d%%: %s. (%s; %s; " + LD_CONTROL, "Problem bootstrapping. Stuck at %d%% (%s): %s. (%s; %s; " "count %d; recommendation %s; host %s at %s)", - status, summary, warn, reason, + status, tag, summary, warn, reason, bootstrap_problems, recommendation, or_id, hostaddr);

1 0

[tor/master] Merge remote-tracking branch 'tlyu-github/ticket28731-035' into maint-0.3.5
by nickm＠torproject.org 14 Dec '18

14 Dec '18

commit 94a79981580d6260597f799bc1a163c8e6f07acd Merge: a3fe08164 1b855af5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 13 18:57:00 2018 -0500 Merge remote-tracking branch 'tlyu-github/ticket28731-035' into maint-0.3.5 changes/ticket28731 | 4 ++++ src/feature/control/control.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/master] Log bootstrap tag names
by nickm＠torproject.org 14 Dec '18

14 Dec '18

commit 1b855af5e33189d70d74273af03a535c343b63a5 Author: Taylor Yu <catalyst(a)torproject.org> Date: Mon Dec 10 17:22:28 2018 -0600 Log bootstrap tag names Add the bootstrap tag name to the log messages, so people troubleshooting connection problems can look up a symbol instead of a number. Closes ticket 28731. --- changes/ticket28731 | 4 ++++ src/feature/control/control.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/ticket28731 b/changes/ticket28731 new file mode 100644 index 000000000..f8b116cc1 --- /dev/null +++ b/changes/ticket28731 @@ -0,0 +1,4 @@ + o Minor features (bootstrap): + - Add the bootstrap tag name to the log messages, so people + troubleshooting connection problems can look up a symbol instead + of a number. Closes ticket 28731. diff --git a/src/feature/control/control.c b/src/feature/control/control.c index 795902e6f..8208b80c2 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -7153,7 +7153,7 @@ control_event_bootstrap_core(int loglevel, bootstrap_status_t status, status = progress; tor_log(loglevel, LD_CONTROL, - "Bootstrapped %d%%: %s", status, summary); + "Bootstrapped %d%% (%s): %s", status, tag, summary); tor_snprintf(buf, sizeof(buf), "BOOTSTRAP PROGRESS=%d TAG=%s SUMMARY=\"%s\"", status, tag, summary); @@ -7309,9 +7309,9 @@ control_event_bootstrap_problem(const char *warn, const char *reason, hostaddr = tor_strdup("?"); log_fn(severity, - LD_CONTROL, "Problem bootstrapping. Stuck at %d%%: %s. (%s; %s; " + LD_CONTROL, "Problem bootstrapping. Stuck at %d%% (%s): %s. (%s; %s; " "count %d; recommendation %s; host %s at %s)", - status, summary, warn, reason, + status, tag, summary, warn, reason, bootstrap_problems, recommendation, or_id, hostaddr);

1 0

[tor/maint-0.3.5] Merge remote-tracking branch 'tlyu-github/ticket28731-035' into maint-0.3.5
by nickm＠torproject.org 14 Dec '18

14 Dec '18

commit 94a79981580d6260597f799bc1a163c8e6f07acd Merge: a3fe08164 1b855af5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 13 18:57:00 2018 -0500 Merge remote-tracking branch 'tlyu-github/ticket28731-035' into maint-0.3.5 changes/ticket28731 | 4 ++++ src/feature/control/control.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.5] Log bootstrap tag names
by nickm＠torproject.org 14 Dec '18

14 Dec '18

commit 1b855af5e33189d70d74273af03a535c343b63a5 Author: Taylor Yu <catalyst(a)torproject.org> Date: Mon Dec 10 17:22:28 2018 -0600 Log bootstrap tag names Add the bootstrap tag name to the log messages, so people troubleshooting connection problems can look up a symbol instead of a number. Closes ticket 28731. --- changes/ticket28731 | 4 ++++ src/feature/control/control.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/ticket28731 b/changes/ticket28731 new file mode 100644 index 000000000..f8b116cc1 --- /dev/null +++ b/changes/ticket28731 @@ -0,0 +1,4 @@ + o Minor features (bootstrap): + - Add the bootstrap tag name to the log messages, so people + troubleshooting connection problems can look up a symbol instead + of a number. Closes ticket 28731. diff --git a/src/feature/control/control.c b/src/feature/control/control.c index 795902e6f..8208b80c2 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -7153,7 +7153,7 @@ control_event_bootstrap_core(int loglevel, bootstrap_status_t status, status = progress; tor_log(loglevel, LD_CONTROL, - "Bootstrapped %d%%: %s", status, summary); + "Bootstrapped %d%% (%s): %s", status, tag, summary); tor_snprintf(buf, sizeof(buf), "BOOTSTRAP PROGRESS=%d TAG=%s SUMMARY=\"%s\"", status, tag, summary); @@ -7309,9 +7309,9 @@ control_event_bootstrap_problem(const char *warn, const char *reason, hostaddr = tor_strdup("?"); log_fn(severity, - LD_CONTROL, "Problem bootstrapping. Stuck at %d%%: %s. (%s; %s; " + LD_CONTROL, "Problem bootstrapping. Stuck at %d%% (%s): %s. (%s; %s; " "count %d; recommendation %s; host %s at %s)", - status, summary, warn, reason, + status, tag, summary, warn, reason, bootstrap_problems, recommendation, or_id, hostaddr);

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'tlyu-github/ticket28731-035' into maint-0.3.5
by nickm＠torproject.org 14 Dec '18

14 Dec '18

commit 94a79981580d6260597f799bc1a163c8e6f07acd Merge: a3fe08164 1b855af5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 13 18:57:00 2018 -0500 Merge remote-tracking branch 'tlyu-github/ticket28731-035' into maint-0.3.5 changes/ticket28731 | 4 ++++ src/feature/control/control.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0