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

[tor/master] Update the changes file for bug7799.
by nickm＠torproject.org 29 Mar '13

29 Mar '13

commit 1d49ba84a82c6dfb8873cf32fdecdf5af0b65c90 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Mar 27 17:43:05 2013 -0700 Update the changes file for bug7799. Still not sure it's actually fixed yet... --- changes/bug7799 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug7799 b/changes/bug7799 index 1bb5597..ed45701 100644 --- a/changes/bug7799 +++ b/changes/bug7799 @@ -1,3 +1,7 @@ o Minor changes (log clarification) - Add more detail to a log message about relaxed timeouts. Hopefully this additional detail will allow us to diagnose the cause of bug 7799. + o Minor bugfixes + - Don't attempt to relax the timeout of already opened 1-hop circuits. + They might never timeout. This should eliminate some/all cases of + the relaxed timeout log message.

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 29 Mar '13

29 Mar '13

commit c3cc79ec38269291f5c066e5f91b32ed4ff473f9 Merge: 097a08f 33f86fa Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 29 12:19:05 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug7799 | 7 +++++++ src/or/circuituse.c | 28 +++++++++++++++++++++------- 2 files changed, 28 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.2.4] Add changes file for bug 7799's log message changes.
by nickm＠torproject.org 29 Mar '13

29 Mar '13

commit cc641ff5b05b2f8bc831ff28fa5d4226933d18a0 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Mar 27 15:33:58 2013 -0700 Add changes file for bug 7799's log message changes. Note this does not close bug 7799. --- changes/bug7799 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug7799 b/changes/bug7799 new file mode 100644 index 0000000..1bb5597 --- /dev/null +++ b/changes/bug7799 @@ -0,0 +1,3 @@ + o Minor changes (log clarification) + - Add more detail to a log message about relaxed timeouts. Hopefully + this additional detail will allow us to diagnose the cause of bug 7799.

1 0

[tor/maint-0.2.4] Add detail to log messages related to bug 7799.
by nickm＠torproject.org 29 Mar '13

29 Mar '13

commit 66586da9bc023bf60b2d18e02004a4e278b73359 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Mar 27 15:34:54 2013 -0700 Add detail to log messages related to bug 7799. Note this does not solve bug 7799, it is only to help us diagnose it. --- src/or/circuituse.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 14576f1..bbf219a 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -536,8 +536,13 @@ circuit_expire_building(void) int first_hop_succeeded = TO_ORIGIN_CIRCUIT(victim)->cpath->state == CPATH_STATE_OPEN; log_info(LD_CIRC, - "No circuits are opened. Relaxing timeout for " - "a circuit with channel state %s. %d guards are live.", + "No circuits are opened. Relaxing timeout for circuit %d " + "(a %s %d-hop circuit in state %s with channel state %s). " + "%d guards are live.", + TO_ORIGIN_CIRCUIT(victim)->global_identifier, + circuit_purpose_to_string(victim->purpose), + TO_ORIGIN_CIRCUIT(victim)->build_state->desired_path_len, + circuit_state_to_string(victim->state), channel_state_to_string(victim->n_chan->state), num_live_entry_guards(0)); @@ -552,10 +557,14 @@ circuit_expire_building(void) } else { static ratelim_t relax_timeout_limit = RATELIM_INIT(3600); log_fn_ratelim(&relax_timeout_limit, LOG_NOTICE, LD_CIRC, - "No circuits are opened. Relaxed timeout for " - "a circuit with channel state %s to %ldms. " - "However, it appears the circuit has timed out anyway. " - "%d guards are live.", + "No circuits are opened. Relaxed timeout for circuit %d " + "(a %s %d-hop circuit in state %s with channel state %s) to " + "%ldms. However, it appears the circuit has timed out " + "anyway. %d guards are live.", + TO_ORIGIN_CIRCUIT(victim)->global_identifier, + circuit_purpose_to_string(victim->purpose), + TO_ORIGIN_CIRCUIT(victim)->build_state->desired_path_len, + circuit_state_to_string(victim->state), channel_state_to_string(victim->n_chan->state), (long)circ_times.close_ms, num_live_entry_guards(0)); }

1 0

[tor/maint-0.2.4] Update the changes file for bug7799.
by nickm＠torproject.org 29 Mar '13

29 Mar '13

commit 1d49ba84a82c6dfb8873cf32fdecdf5af0b65c90 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Mar 27 17:43:05 2013 -0700 Update the changes file for bug7799. Still not sure it's actually fixed yet... --- changes/bug7799 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug7799 b/changes/bug7799 index 1bb5597..ed45701 100644 --- a/changes/bug7799 +++ b/changes/bug7799 @@ -1,3 +1,7 @@ o Minor changes (log clarification) - Add more detail to a log message about relaxed timeouts. Hopefully this additional detail will allow us to diagnose the cause of bug 7799. + o Minor bugfixes + - Don't attempt to relax the timeout of already opened 1-hop circuits. + They might never timeout. This should eliminate some/all cases of + the relaxed timeout log message.

1 0

[tor/maint-0.2.4] Don't relax the timeout for already opened 1-hop circuits.
by nickm＠torproject.org 29 Mar '13

29 Mar '13

commit d39e6736fe1608028223604f49d5d091ef23bb27 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Mar 27 17:43:27 2013 -0700 Don't relax the timeout for already opened 1-hop circuits. --- src/or/circuituse.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index bbf219a..8fb70f5 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -529,7 +529,12 @@ circuit_expire_building(void) if (timercmp(&victim->timestamp_began, &cutoff, >)) continue; /* it's still young, leave it alone */ - if (!any_opened_circs) { + /* We need to double-check the opened state here because + * we don't want to consider opened 1-hop dircon circuits for + * deciding when to relax the timeout, but we *do* want to relax + * those circuits too if nothing else is opened *and* they still + * aren't either. */ + if (!any_opened_circs && victim->state != CIRCUIT_STATE_OPEN) { /* It's still young enough that we wouldn't close it, right? */ if (timercmp(&victim->timestamp_began, &close_cutoff, >)) { if (!TO_ORIGIN_CIRCUIT(victim)->relaxed_timeout) {

1 0

[tor/maint-0.2.4] Merge branch 'bug7799_rebased' into maint-0.2.4
by nickm＠torproject.org 29 Mar '13

29 Mar '13

commit 33f86faa5a20c3c2b7c6be386186bb01b5883739 Merge: 96c0a42 d39e673 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 29 12:17:35 2013 -0400 Merge branch 'bug7799_rebased' into maint-0.2.4 changes/bug7799 | 7 +++++++ src/or/circuituse.c | 28 +++++++++++++++++++++------- 2 files changed, 28 insertions(+), 7 deletions(-)

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 29 Mar '13

29 Mar '13

commit 568f3352487d139df691c0cb71f57ef3a5aa3037 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 29 16:15:34 2013 +0000 Update translations for vidalia_help --- el/services.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/el/services.po b/el/services.po index 2856d47..5437514 100644 --- a/el/services.po +++ b/el/services.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-03-29 01:57+0000\n" +"PO-Revision-Date: 2013-03-29 16:15+0000\n" "Last-Translator: Wasilis <m.wasilis(a)yahoo.de>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -154,7 +154,7 @@ msgid "" "Vidalia and save the configuration. Then move the directory on your hard " "disk to the new place. Finally, change the directory in Vidalia to the new " "location, enable the service again, and save the new configuration." -msgstr "" +msgstr "Service Directory (required): Tor needs to store some hidden-service specific files in a separate directory, e.g. a private key and a hostname file containing the onion address. This directory should be distinct from a directory containing content that the service provides. A good place for a service directory might be a sub directory in Tor's data directory. -- Note that you cannot change the directory of a running service (it wouldn't make much sense to allow it, because Vidalia is not supposed to move directories on your hard disk!). If you want to move a hidden service to another directory, please proceed as follows: Start by disabling the service in Vidalia and save the configuration. Then move the directory on your hard disk to the new place. Finally, change the directory in Vidalia to the new location, enable the service again, and save the new configuration." #. type: Content of: <html><body><p><ul><li> #: en/services.html:95 @@ -163,12 +163,12 @@ msgid "" "hidden service in Tor. This can be useful for keeping the configuration of a" " currently unused service for later use. All non-enabled services are stored" " in the Vidalia-specific configuration file vidalia.conf." -msgstr "" +msgstr "Ενεργοποιημένo : Εάν αυτό το πλαίσιο ελέγχου είναι απενεργοποιημένο, to Vidalia δεν θα διαμορφώση το κρυμμένο δεδομενο της υπηρεσίας Tor. " #. type: Content of: <html><body> #: en/services.html:103 msgid "<a name=\"buttons\"/>" -msgstr "" +msgstr "<a name=\"buttons\"/>" #. type: Content of: <html><body><h3> #: en/services.html:104

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 29 Mar '13

29 Mar '13

commit 80a7d00ce5ba47bafe95814fbe7488c5d738a4a9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 29 12:15:34 2013 +0000 Update translations for vidalia_help --- gl/bridges.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gl/bridges.po b/gl/bridges.po index 218b475..71178ec 100644 --- a/gl/bridges.po +++ b/gl/bridges.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2013-03-13 07:54+0000\n" +"PO-Revision-Date: 2013-03-29 11:56+0000\n" "Last-Translator: mbouzada <mbouzada(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -41,7 +41,7 @@ msgid "" "no complete public list of them, even if your ISP is filtering connections " "to all the known Tor relays, they probably won't be able to block all the " "bridges." -msgstr "" +msgstr "Algúns provedores de servizos da Internet (ISP) tentan evitar que os seus usuarios accedan á rede Tor bloqueando conexións cos repetidores Tor coñecidos. Os repetidores ponte (ou <i>pontes</i> para acurtar) son repetidores que axudan a estes usuarios censurados a acceder á rede Tor. A diferencia de outros repetidores Tor, as pontes non aparecen listadas nos mesmos repositorios públicos que os repetidores ordinarios. Como non hai unha lista pública completa delas, incluso se o ISP está filtrando conexións a todos os repetidores Tor coñecidos, é moi probábel que non poida bloquear todas as pontes. " #. type: Content of: <html><body> #: en/bridges.html:31

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 29 Mar '13

29 Mar '13

commit 51feafd2f21af5e436c50b88bf3d11ee8082918e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 29 11:15:35 2013 +0000 Update translations for vidalia_help --- nb/troubleshooting.po | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/nb/troubleshooting.po b/nb/troubleshooting.po index a037891..03cc573 100644 --- a/nb/troubleshooting.po +++ b/nb/troubleshooting.po @@ -1,23 +1,24 @@ # # Translators: +# Trent Renshaw <trent.renshaw(a)penguinhost.com.au>, 2013. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2010-11-30 05:04+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2013-03-29 10:56+0000\n" +"Last-Translator: trenshaw <trent.renshaw(a)penguinhost.com.au>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: nb\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" # type: Content of: <html><body><h1> #: en/troubleshooting.html:16 msgid "Troubleshooting" -msgstr "" +msgstr "Feilsøking" # type: Content of: <html><body> #: en/troubleshooting.html:19 @@ -26,12 +27,12 @@ msgid "" "running Tor. If you can't find anything about the particular problem you're " "having, check out our website at <i>www.vidalia-project.net</i> for more " "support and information. <a name=\"start\"/>" -msgstr "" +msgstr "Listet nedenfor er noen av de vanligste problemer eller spørsmål mennesker har mens de bruker Tor. Hvis du ikke finner noe om det spesielle problemet du har, sjekk ut vår hjemmeside på <i>www.vidalia-project.net</i> for mer støtte og informasjon. <a name=\"start\"/>" # type: Content of: <html><body><h3> #: en/troubleshooting.html:25 msgid "I Can't Start Tor" -msgstr "" +msgstr "Jeg kan ikke starte Tor" # type: Content of: <html><body><p> #: en/troubleshooting.html:27 @@ -241,5 +242,3 @@ msgid "" "href=\"log.html\">message log</a> to see if Tor reported any errors while " "trying to exit." msgstr "" - -

1 0