- tor-commits - lists.torproject.org

[tor/master] Wait for busy authorities/fallbacks rather than ignoring excluded nodes
by nickm＠torproject.org 16 Dec '15

16 Dec '15

commit 978210d5a868e8b0f5bd5f83804117ae46954f5f Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Mon Dec 14 20:20:52 2015 +1100 Wait for busy authorities/fallbacks rather than ignoring excluded nodes Applies the 6c443e987d fix to router_pick_directory_server_impl. 6c443e987d applied to directory servers chosen from the consensus, and was: "Tweak the 9969 fix a little If we have busy nodes and excluded nodes, then don't retry with the excluded ones enabled. Instead, wait for the busy ones to be nonbusy." --- changes/feature17864 | 5 +++++ src/or/routerlist.c | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/changes/feature17864 b/changes/feature17864 new file mode 100644 index 0000000..1cf1562 --- /dev/null +++ b/changes/feature17864 @@ -0,0 +1,5 @@ + o Minor feature (directory downloads): + - Wait for busy authorities and fallbacks to become non-busy when + bootstrapping. (A similar change was made in 6c443e987d for + directory servers chosen from the consensus.) + Closes ticket 17864; patch by "teor". diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 051bac5..c45854c 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1739,22 +1739,24 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist, result = &selection->fake_status; } - if (n_busy_out) - *n_busy_out = n_busy; - smartlist_free(direct); smartlist_free(tunnel); smartlist_free(overloaded_direct); smartlist_free(overloaded_tunnel); - if (result == NULL && try_excluding && !options->StrictNodes && n_excluded) { + if (result == NULL && try_excluding && !options->StrictNodes && n_excluded + && !n_busy) { /* If we got no result, and we are excluding nodes, and StrictNodes is * not set, try again without excluding nodes. */ try_excluding = 0; n_excluded = 0; + n_busy = 0; goto retry_without_exclude; } + if (n_busy_out) + *n_busy_out = n_busy; + return result; }

1 0

[tor/master] More debugging code to try to track down #17659
by nickm＠torproject.org 16 Dec '15

16 Dec '15

commit a03469aa851bf6e658d539e95b5f1e786f9622bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 16 08:37:40 2015 -0500 More debugging code to try to track down #17659 --- src/or/connection_edge.c | 31 ++++++++++++++++++++++++++++--- src/or/or.h | 7 +++++++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 7a2de29..961e49a 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -780,6 +780,15 @@ connection_ap_rescan_and_attach_pending(void) connection_ap_attach_pending(1); } +#ifdef DEBUGGING_17659 +#define UNMARK() do { \ + entry_conn->marked_pending_circ_line = 0; \ + entry_conn->marked_pending_circ_file = 0; \ + } while (0) +#else +#define UNMARK() do { } while (0) +#endif + /** Tell any AP streams that are listed as waiting for a new circuit to try * again, either attaching to an available circ or launching a new one. * @@ -801,12 +810,14 @@ connection_ap_attach_pending(int retry) connection_t *conn = ENTRY_TO_CONN(entry_conn); tor_assert(conn && entry_conn); if (conn->marked_for_close) { + UNMARK(); SMARTLIST_DEL_CURRENT(pending_entry_connections, entry_conn); continue; } if (conn->magic != ENTRY_CONNECTION_MAGIC) { - log_warn(LD_BUG, "%p has impossible magic value %u", + log_warn(LD_BUG, "%p has impossible magic value %u.", entry_conn, (unsigned)conn->magic); + UNMARK(); SMARTLIST_DEL_CURRENT(pending_entry_connections, entry_conn); continue; } @@ -815,6 +826,7 @@ connection_ap_attach_pending(int retry) "is %s. Why is it on pending_entry_connections?", entry_conn, conn_state_to_string(conn->type, conn->state)); + UNMARK(); SMARTLIST_DEL_CURRENT(pending_entry_connections, entry_conn); continue; } @@ -828,6 +840,7 @@ connection_ap_attach_pending(int retry) if (conn->marked_for_close || conn->type != CONN_TYPE_AP || conn->state != AP_CONN_STATE_CIRCUIT_WAIT) { + UNMARK(); SMARTLIST_DEL_CURRENT(pending_entry_connections, entry_conn); continue; } @@ -862,12 +875,23 @@ connection_ap_mark_as_pending_circuit_(entry_connection_t *entry_conn, if (PREDICT_UNLIKELY(smartlist_contains(pending_entry_connections, entry_conn))) { log_warn(LD_BUG, "What?? pending_entry_connections already contains %p! " - "(called from %s:%d)", + "(Called from %s:%d.)", entry_conn, fname, lineno); - log_backtrace(LOG_WARN, LD_BUG, "To debug, this may help."); +#ifdef DEBUGGING_17659 + const char *f2 = entry_conn->marked_pending_circ_file; + log_warn(LD_BUG, "(Previously called from %s:%d.)\n", + f2 ? f2 : "<NULL>", + entry_conn->marked_pending_circ_line); +#endif + log_backtrace(LOG_WARN, LD_BUG, "To debug, this may help"); return; } +#ifdef DEBUGGING_17659 + entry_conn->marked_pending_circ_line = (uint16_t) lineno; + entry_conn->marked_pending_circ_file = fname; +#endif + untried_pending_connections = 1; smartlist_add(pending_entry_connections, entry_conn); } @@ -878,6 +902,7 @@ connection_ap_mark_as_non_pending_circuit(entry_connection_t *entry_conn) { if (PREDICT_UNLIKELY(NULL == pending_entry_connections)) return; + UNMARK(); smartlist_remove(pending_entry_connections, entry_conn); } diff --git a/src/or/or.h b/src/or/or.h index e92a4bb..e621fe9 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1646,6 +1646,13 @@ typedef struct entry_connection_t { * request that we're going to try to answer. */ struct evdns_server_request *dns_server_request; +#define DEBUGGING_17659 + +#ifdef DEBUGGING_17659 + uint16_t marked_pending_circ_line; + const char *marked_pending_circ_file; +#endif + #define NUM_CIRCUITS_LAUNCHED_THRESHOLD 10 /** Number of times we've launched a circuit to handle this stream. If * it gets too high, that could indicate an inconsistency between our

1 0

[tor/master] Add some assertions to try to catch #17752
by nickm＠torproject.org 16 Dec '15

16 Dec '15

commit a4ca2ef1fffec0181b18f24a4aaaa71856108ce2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 16 08:24:54 2015 -0500 Add some assertions to try to catch #17752 --- src/or/connection_edge.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 30dcd13..7a2de29 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -765,6 +765,7 @@ connection_ap_rescan_and_attach_pending(void) continue; entry_conn = TO_ENTRY_CONN(conn); + tor_assert(entry_conn); if (! smartlist_contains(pending_entry_connections, entry_conn)) { log_warn(LD_BUG, "Found a connection %p that was supposed to be " "in pending_entry_connections, but wasn't. No worries; " @@ -798,6 +799,7 @@ connection_ap_attach_pending(int retry) SMARTLIST_FOREACH_BEGIN(pending_entry_connections, entry_connection_t *, entry_conn) { connection_t *conn = ENTRY_TO_CONN(entry_conn); + tor_assert(conn && entry_conn); if (conn->marked_for_close) { SMARTLIST_DEL_CURRENT(pending_entry_connections, entry_conn); continue;

1 0

[tor/master] ... and fix the linux backtrace_symbols{, _fd} calls
by nickm＠torproject.org 16 Dec '15

16 Dec '15

commit c4df0c9f52cfeee414c7316073c92975ebd81c85 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 16 08:20:53 2015 -0500 ... and fix the linux backtrace_symbols{,_fd} calls --- src/common/backtrace.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/backtrace.c b/src/common/backtrace.c index 8d544ed..bed0442 100644 --- a/src/common/backtrace.c +++ b/src/common/backtrace.c @@ -96,7 +96,7 @@ log_backtrace(int severity, int domain, const char *msg) tor_mutex_acquire(&cb_buf_mutex); depth = backtrace(cb_buf, MAX_DEPTH); - symbols = backtrace_symbols(cb_buf, depth); + symbols = backtrace_symbols(cb_buf, (int)depth); tor_log(severity, domain, "%s. Stack trace:", msg); if (!symbols) { @@ -139,7 +139,7 @@ crash_handler(int sig, siginfo_t *si, void *ctx_) n_fds = tor_log_get_sigsafe_err_fds(&fds); for (i=0; i < n_fds; ++i) - backtrace_symbols_fd(cb_buf, depth, fds[i]); + backtrace_symbols_fd(cb_buf, (int)depth, fds[i]); abort(); } @@ -175,7 +175,7 @@ install_bt_handler(void) * reads won't be denied by the sandbox code */ char **symbols; size_t depth = backtrace(cb_buf, MAX_DEPTH); - symbols = backtrace_symbols(cb_buf, depth); + symbols = backtrace_symbols(cb_buf, (int) depth); if (symbols) free(symbols); }

1 0

[translation/tor-messenger-privdtd_completed] Update translations for tor-messenger-privdtd_completed
by translation＠torproject.org 16 Dec '15

16 Dec '15

commit 31a756f74b5bfc14db3b2926b2b57a7769118239 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 16 10:16:56 2015 +0000 Update translations for tor-messenger-privdtd_completed --- cs/priv.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cs/priv.dtd b/cs/priv.dtd new file mode 100644 index 0000000..21f363e --- /dev/null +++ b/cs/priv.dtd @@ -0,0 +1,2 @@ +<!ENTITY privDialog.title "Generování soukromého klíče"> +<!ENTITY privDialog.done "Hotovo"> \ No newline at end of file

1 0

[translation/tor-messenger-privdtd] Update translations for tor-messenger-privdtd
by translation＠torproject.org 16 Dec '15

16 Dec '15

commit 84570aa3f69f80c7284d267264b31db8580caeaa Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 16 10:16:51 2015 +0000 Update translations for tor-messenger-privdtd --- cs/priv.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cs/priv.dtd b/cs/priv.dtd index cb6883b..21f363e 100644 --- a/cs/priv.dtd +++ b/cs/priv.dtd @@ -1,2 +1,2 @@ -<!ENTITY privDialog.title "Generating private key"> +<!ENTITY privDialog.title "Generování soukromého klíče"> <!ENTITY privDialog.done "Hotovo"> \ No newline at end of file

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 16 Dec '15

16 Dec '15

commit 2faa9c1974c8e2ed7b6ef9d08c59860c01a45e4f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 16 10:16:16 2015 +0000 Update translations for torbutton-abouttorproperties --- cs/abouttor.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cs/abouttor.properties b/cs/abouttor.properties index 93185df..d0361e7 100644 --- a/cs/abouttor.properties +++ b/cs/abouttor.properties @@ -22,11 +22,11 @@ aboutTor.searchDC.search.link=https://search.disconnect.me/ aboutTor.donationBanner.lp.who=— Laura Poitras aboutTor.donationBanner.lp.quote=Edward Snowden would not have been able to contact me without Tor and other free software encryption projects. Tor is an essential tool, and it needs our support. -aboutTor.donationBanner.lp.speciality=Oscar-Winning Documentary Filmmaker, <i>CitizenFour</i> +aboutTor.donationBanner.lp.speciality=Oscar-Dokumentarista, <i>CitizenFour</i> aboutTor.donationBanner.cd.who=— Cory Doctorow -aboutTor.donationBanner.cd.quote=Privacy and anonymity matter to all of us. -aboutTor.donationBanner.cd.speciality= Novelist, technology activist, co-editor of Boing Boing +aboutTor.donationBanner.cd.quote=Ochrana osobních údajů a záležitost anonymity pro všechny z nás. +aboutTor.donationBanner.cd.speciality= Spisovatel, technologický aktivista, co-editor Boing Boing aboutTor.donationBanner.rd.who=— Roger Dingledine aboutTor.donationBanner.rd.quote=Please help the strongest privacy tool in the world become more sustainable!

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 16 Dec '15

16 Dec '15

commit e94578bb7364f383db7c24dea3f9b6a417a32e48 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 16 10:15:54 2015 +0000 Update translations for abouttor-homepage_completed --- cs/aboutTor.dtd | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cs/aboutTor.dtd b/cs/aboutTor.dtd index 6215859..0c32dfd 100644 --- a/cs/aboutTor.dtd +++ b/cs/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "O TORu"> -<!ENTITY aboutTor.outOfDateTorOn.label "Avšak tento prohlížeč je zastaralý."> +<!ENTITY aboutTor.outOfDateTorOn.label "VAROVÁNÍ: Tento prohlížeč je zastaralý."> <!ENTITY aboutTor.outOfDateTorOff.label "Také tento prohlížeč je zastaralý."> <!ENTITY aboutTor.outOfDate2.label "Klikněte na cibuli a vyberte Hledat aktualizace pro Tor Browser."> <!ENTITY aboutTor.check.label "Otestovat síťové nastavení TORu"> -<!ENTITY aboutTor.success.label "Gratulujeme!"> -<!ENTITY aboutTor.success2.label "Tento prohližeč je správně nakonfigurován pro použití TOR."> +<!ENTITY aboutTor.success.label "Vítejte v Tor Prohlížeči"> +<!ENTITY aboutTor.success2.label "Připojeno k síti Tor."> <!ENTITY aboutTor.success3.label "Nýní můžete prohlížet web anonymně."> <!ENTITY aboutTor.failure.label "Něco se nepovedlo!"> <!ENTITY aboutTor.failure2.label "TOR v tomto prohližeči nefunguje."> @@ -47,3 +47,6 @@ <!ENTITY aboutTor.footer.label "Tor Projekt je US501(c)(3) neprofitující a zaměřen na výzkum, vývoj a výuku online anonymity a soukromí."> <!ENTITY aboutTor.learnMore.label "Dozvědět se více o projektu TOR"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> + +<!ENTITY aboutTor.donate.donate "Přispějte"> +<!ENTITY aboutTor.donate.supportTor "Podpořte prosím Tor!">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 16 Dec '15

16 Dec '15

commit d8b0c4ee1898d0c19fc48226b6d733a8ad32bb77 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 16 10:15:49 2015 +0000 Update translations for abouttor-homepage --- cs/aboutTor.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cs/aboutTor.dtd b/cs/aboutTor.dtd index 1f02d21..0c32dfd 100644 --- a/cs/aboutTor.dtd +++ b/cs/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "O TORu"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "VAROVÁNÍ: Tento prohlížeč je zastaralý."> <!ENTITY aboutTor.outOfDateTorOff.label "Také tento prohlížeč je zastaralý."> <!ENTITY aboutTor.outOfDate2.label "Klikněte na cibuli a vyberte Hledat aktualizace pro Tor Browser."> <!ENTITY aboutTor.check.label "Otestovat síťové nastavení TORu"> -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> +<!ENTITY aboutTor.success.label "Vítejte v Tor Prohlížeči"> +<!ENTITY aboutTor.success2.label "Připojeno k síti Tor."> <!ENTITY aboutTor.success3.label "Nýní můžete prohlížet web anonymně."> <!ENTITY aboutTor.failure.label "Něco se nepovedlo!"> <!ENTITY aboutTor.failure2.label "TOR v tomto prohližeči nefunguje."> @@ -49,4 +49,4 @@ <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> <!ENTITY aboutTor.donate.donate "Přispějte"> -<!ENTITY aboutTor.donate.supportTor "Please support Tor!"> +<!ENTITY aboutTor.donate.supportTor "Podpořte prosím Tor!">

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 16 Dec '15

16 Dec '15

commit 9fa814d1514bd10408b7d4143f5a3617531aaa9a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 16 10:15:42 2015 +0000 Update translations for tor-launcher-network-settings_completed --- cs/network-settings.dtd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cs/network-settings.dtd b/cs/network-settings.dtd index 01edf74..bdf2fd2 100644 --- a/cs/network-settings.dtd +++ b/cs/network-settings.dtd @@ -1,5 +1,9 @@ <!ENTITY torsettings.dialog.title "Síťové nastavení TORu"> + +<!ENTITY torlauncher.localePicker.title "Jazyk Tor Prohlížeče"> +<!ENTITY torlauncher.localePicker.prompt "Prosím zvolte jazyk."> +  <!ENTITY torsettings.prompt "Než se připojíte s síti TORu je potřeba poskytnout údaje o internetovém připojení tohoto počítače.">

1 0