June 2015 - tor-commits - lists.torproject.org

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 18 Jun '15

18 Jun '15

commit fb05ca106d48895a928c1edb050486f1cc6df056 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 18 18:45:41 2015 +0000 Update translations for tails-misc --- zh_CN.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index 79a8576..e1936de 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-02 23:47+0200\n" -"PO-Revision-Date: 2015-06-18 17:00+0000\n" +"PO-Revision-Date: 2015-06-18 18:28+0000\n" "Last-Translator: YF <yfdyh000(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -364,7 +364,7 @@ msgstr "警告：检测到虚拟机！" msgid "" "Both the host operating system and the virtualization software are able to " "monitor what you are doing in Tails." -msgstr "主机操作系统和虚拟软件都可监视 Tails 用户的行为。" +msgstr "主机操作系统和虚拟化软件都可能监视您在使用 Tails 时的行为。" #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57 msgid ""

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 18 Jun '15

18 Jun '15

commit 88701307d5b258af320734df1264e8b71ef76f82 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 18 17:15:50 2015 +0000 Update translations for tails-misc_completed --- zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN.po b/zh_CN.po index 1de660e..79a8576 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-02 23:47+0200\n" -"PO-Revision-Date: 2015-06-16 14:57+0000\n" +"PO-Revision-Date: 2015-06-18 17:00+0000\n" "Last-Translator: YF <yfdyh000(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 18 Jun '15

18 Jun '15

commit 15ecd4627129dd19dba5a62189d9cbbd938043d0 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 18 17:15:46 2015 +0000 Update translations for tails-misc --- zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN.po b/zh_CN.po index 1de660e..79a8576 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-02 23:47+0200\n" -"PO-Revision-Date: 2015-06-16 14:57+0000\n" +"PO-Revision-Date: 2015-06-18 17:00+0000\n" "Last-Translator: YF <yfdyh000(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 18 Jun '15

18 Jun '15

commit 4c0b895bf2c2a0e6dcab05534b3a8b796331782c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 18 17:15:35 2015 +0000 Update translations for mat-gui_completed --- zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN.po b/zh_CN.po index a64b937..4bbbec8 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-31 04:53+0100\n" -"PO-Revision-Date: 2015-06-18 14:14+0000\n" +"PO-Revision-Date: 2015-06-18 17:00+0000\n" "Last-Translator: YF <yfdyh000(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 18 Jun '15

18 Jun '15

commit d052509a4fbf1b31f5e35f59b4a50dfe54296252 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 18 17:15:31 2015 +0000 Update translations for mat-gui --- zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN.po b/zh_CN.po index a64b937..4bbbec8 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-31 04:53+0100\n" -"PO-Revision-Date: 2015-06-18 14:14+0000\n" +"PO-Revision-Date: 2015-06-18 17:00+0000\n" "Last-Translator: YF <yfdyh000(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] Revert "Do not replace a HS descriptor with a different replica of itself"
by nickm＠torproject.org 18 Jun '15

18 Jun '15

commit 8acf5255c20c667f32313ee672c85f6ae00a4f87 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Tue Jun 16 13:16:34 2015 -0400 Revert "Do not replace a HS descriptor with a different replica of itself" This reverts commit 9407040c592184e05e45a3c1a00739c2dd302288. Small fix, "e->received" had to be removed since that variable doesn't exist anymore. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- changes/bug16381 | 13 +++++++++++++ src/or/rendcommon.c | 10 ++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/changes/bug16381 b/changes/bug16381 new file mode 100644 index 0000000..51a9b53 --- /dev/null +++ b/changes/bug16381 @@ -0,0 +1,13 @@ + o Major bugfix (Hidden service client) + - Revert commit 9407040c592184e05e45a3c1a00739c2dd302288 of bug #14219 + that indeed fixed an issue but introduced a major hidden service + reachability regression detailed in bug #16381. This is a temporary + fix since we can live with the minor issue in #14219 but the + regression introduced is too much of a set back. + + To be clear, #14219 bug just results in some load on the network, and + some delay for the client when visiting a hidden service that will + ultimately fail. + + This is only a bandaid for #16381 thus it does _not_ fixes it. bugfix + on tor-0.2.6.3-alpha~138. diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 5fdd13e..6698f2f 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1249,12 +1249,18 @@ rend_cache_store_v2_desc_as_client(const char *desc, /* Do we already have a newer descriptor? */ tor_snprintf(key, sizeof(key), "2%s", service_id); e = (rend_cache_entry_t*) strmap_get_lc(rend_cache, key); - if (e && e->parsed->timestamp >= parsed->timestamp) { - log_info(LD_REND, "We already have a new enough service descriptor for " + if (e && e->parsed->timestamp > parsed->timestamp) { + log_info(LD_REND, "We already have a newer service descriptor for " "service ID %s with the same desc ID and version.", safe_str_client(service_id)); goto okay; } + /* Do we already have this descriptor? */ + if (e && !strcmp(desc, e->desc)) { + log_info(LD_REND,"We already have this service descriptor %s.", + safe_str_client(service_id)); + goto okay; + } if (!e) { e = tor_malloc_zero(sizeof(rend_cache_entry_t)); strmap_set_lc(rend_cache, key, e);

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug16381_026_01-revert' into maint-0.2.6
by nickm＠torproject.org 18 Jun '15

18 Jun '15

commit f18ee7fc7287e9d5f55c7c6c2007a8a1c2466a3e Merge: c8cb556 8acf525 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 18 11:30:01 2015 -0400 Merge remote-tracking branch 'dgoulet/bug16381_026_01-revert' into maint-0.2.6 changes/bug16381 | 13 +++++++++++++ src/or/rendcommon.c | 10 ++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'
by nickm＠torproject.org 18 Jun '15

18 Jun '15

commit 583a387c1ea855c0b063f14c382b2cedcdc3dc08 Merge: c2c23d1 f18ee7f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 18 11:33:24 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' changes/bug16381 | 13 +++++++++++++ src/or/rendcommon.c | 10 ++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.6] Revert "Do not replace a HS descriptor with a different replica of itself"
by nickm＠torproject.org 18 Jun '15

18 Jun '15

commit 8acf5255c20c667f32313ee672c85f6ae00a4f87 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Tue Jun 16 13:16:34 2015 -0400 Revert "Do not replace a HS descriptor with a different replica of itself" This reverts commit 9407040c592184e05e45a3c1a00739c2dd302288. Small fix, "e->received" had to be removed since that variable doesn't exist anymore. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- changes/bug16381 | 13 +++++++++++++ src/or/rendcommon.c | 10 ++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/changes/bug16381 b/changes/bug16381 new file mode 100644 index 0000000..51a9b53 --- /dev/null +++ b/changes/bug16381 @@ -0,0 +1,13 @@ + o Major bugfix (Hidden service client) + - Revert commit 9407040c592184e05e45a3c1a00739c2dd302288 of bug #14219 + that indeed fixed an issue but introduced a major hidden service + reachability regression detailed in bug #16381. This is a temporary + fix since we can live with the minor issue in #14219 but the + regression introduced is too much of a set back. + + To be clear, #14219 bug just results in some load on the network, and + some delay for the client when visiting a hidden service that will + ultimately fail. + + This is only a bandaid for #16381 thus it does _not_ fixes it. bugfix + on tor-0.2.6.3-alpha~138. diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 5fdd13e..6698f2f 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1249,12 +1249,18 @@ rend_cache_store_v2_desc_as_client(const char *desc, /* Do we already have a newer descriptor? */ tor_snprintf(key, sizeof(key), "2%s", service_id); e = (rend_cache_entry_t*) strmap_get_lc(rend_cache, key); - if (e && e->parsed->timestamp >= parsed->timestamp) { - log_info(LD_REND, "We already have a new enough service descriptor for " + if (e && e->parsed->timestamp > parsed->timestamp) { + log_info(LD_REND, "We already have a newer service descriptor for " "service ID %s with the same desc ID and version.", safe_str_client(service_id)); goto okay; } + /* Do we already have this descriptor? */ + if (e && !strcmp(desc, e->desc)) { + log_info(LD_REND,"We already have this service descriptor %s.", + safe_str_client(service_id)); + goto okay; + } if (!e) { e = tor_malloc_zero(sizeof(rend_cache_entry_t)); strmap_set_lc(rend_cache, key, e);

1 0

[tor/maint-0.2.6] Merge remote-tracking branch 'dgoulet/bug16381_026_01-revert' into maint-0.2.6
by nickm＠torproject.org 18 Jun '15

18 Jun '15

commit f18ee7fc7287e9d5f55c7c6c2007a8a1c2466a3e Merge: c8cb556 8acf525 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 18 11:30:01 2015 -0400 Merge remote-tracking branch 'dgoulet/bug16381_026_01-revert' into maint-0.2.6 changes/bug16381 | 13 +++++++++++++ src/or/rendcommon.c | 10 ++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-)

1 0