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

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

17 Jun '15

commit c8cb55659acca96530a1d7f54bb96cac84626e17 Merge: 59fa0c2 75388f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 17 09:18:45 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/bug16360-failed-crypto-early-init | 7 +++++++ src/or/main.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.5] Correctly handle failed crypto_early_init
by nickm＠torproject.org 17 Jun '15

17 Jun '15

commit 75388f67c07d1a48c6fb9c5d1c4441ab66b644c0 Author: teor <teor2345(a)gmail.com> Date: Sat Jun 13 21:28:02 2015 +1000 Correctly handle failed crypto_early_init If crypto_early_init fails, a typo in a return value from tor_init means that tor_main continues running, rather than returning an error value. Fixes bug 16360; bugfix on d3fb846d8c98 in 0.2.5.2-alpha, introduced when implementing #4900. Patch by "teor". --- changes/bug16360-failed-crypto-early-init | 7 +++++++ src/or/main.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug16360-failed-crypto-early-init b/changes/bug16360-failed-crypto-early-init new file mode 100644 index 0000000..21972bc --- /dev/null +++ b/changes/bug16360-failed-crypto-early-init @@ -0,0 +1,7 @@ + o Minor bugfixes (crypto error-handling): + - If crypto_early_init fails, a typo in a return value from tor_init + means that tor_main continues running, rather than returning + an error value. + Fixes bug 16360; bugfix on d3fb846d8c98 in 0.2.5.2-alpha, + introduced when implementing #4900. + Patch by "teor". diff --git a/src/or/main.c b/src/or/main.c index 9c1cabf..031f758 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2346,7 +2346,7 @@ tor_init(int argc, char *argv[]) /* Set up the crypto nice and early */ if (crypto_early_init() < 0) { log_err(LD_GENERAL, "Unable to initialize the crypto subsystem!"); - return 1; + return -1; } /* Initialize the history structures. */

1 0

[tor/master] Fix spacing in tortls.c
by nickm＠torproject.org 17 Jun '15

17 Jun '15

commit 4079d2e0a5d3b8abed541d473485f22ae8746636 Author: teor <teor2345(a)gmail.com> Date: Tue Jun 16 03:10:44 2015 +1000 Fix spacing in tortls.c --- src/common/tortls.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 98840c1..bd0eaff 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -2641,7 +2641,6 @@ SSL_SESSION_get_master_key(SSL_SESSION *s, uint8_t *out, size_t len) } #endif - /** Set the DIGEST256_LEN buffer at <b>secrets_out</b> to the value used in * the v3 handshake to prove that the client knows the TLS secrets for the * connection <b>tls</b>. Return 0 on success, -1 on failure. @@ -2677,7 +2676,9 @@ tor_tls_get_tlssecrets,(tor_tls_t *tls, uint8_t *secrets_out)) tor_assert(r == client_random_len); } { - size_t r = SSL_get_server_random(ssl, buf+client_random_len, server_random_len); + size_t r = SSL_get_server_random(ssl, + buf+client_random_len, + server_random_len); tor_assert(r == server_random_len); } uint8_t *master_key = tor_malloc_zero(master_key_len);

1 0

[tor/master] Document the consensus download interval used by hidden services
by nickm＠torproject.org 17 Jun '15

17 Jun '15

commit 8092ae0c4ecc05d2bc058531be976e374febd9cb Author: teor <teor2345(a)gmail.com> Date: Tue Jun 16 03:11:09 2015 +1000 Document the consensus download interval used by hidden services In the comments in update_consensus_networkstatus_fetch_time_impl in networkstatus.c --- src/or/networkstatus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index da110fd..9de1f88 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -856,8 +856,8 @@ update_consensus_networkstatus_fetch_time_impl(time_t now, int flav) dl_interval = interval/2; } } else { - /* We're an ordinary client or a bridge. Give all the caches enough - * time to download the consensus. */ + /* We're an ordinary client, a bridge, or a hidden service. + * Give all the caches enough time to download the consensus. */ start = (time_t)(c->fresh_until + (interval*3)/4); /* But download the next one well before this one is expired. */ dl_interval = ((c->valid_until - start) * 7 )/ 8;

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 17 Jun '15

17 Jun '15

commit b60241eacb2a04d1827364603fe484f13f394560 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 17 10:15:28 2015 +0000 Update translations for tails-persistence-setup_completed --- zh_CN/zh_CN.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index 4e3cffa..3b7cf09 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -3,8 +3,8 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Wu Ming Shi, 2013 -# Wu Ming Shi, 2013 +# khi, 2013 +# khi, 2013 # leungsookfan <leung.sookfan(a)riseup.net>, 2014 # Sanya chang <408070986(a)qq.com>, 2013 # Xiaolan <xiaolan65535(a)gmail.com>, 2014 @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-02-23 13:07+0100\n" -"PO-Revision-Date: 2015-02-24 13:06+0000\n" +"POT-Creation-Date: 2015-05-02 21:08+0200\n" +"PO-Revision-Date: 2015-06-17 09:56+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-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 17 Jun '15

17 Jun '15

commit 0b4f0032a26f354852e0c2d67b466df8d08f89eb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 17 10:15:23 2015 +0000 Update translations for tails-persistence-setup --- zh_CN/zh_CN.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index 4e3cffa..3b7cf09 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -3,8 +3,8 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Wu Ming Shi, 2013 -# Wu Ming Shi, 2013 +# khi, 2013 +# khi, 2013 # leungsookfan <leung.sookfan(a)riseup.net>, 2014 # Sanya chang <408070986(a)qq.com>, 2013 # Xiaolan <xiaolan65535(a)gmail.com>, 2014 @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-02-23 13:07+0100\n" -"PO-Revision-Date: 2015-02-24 13:06+0000\n" +"POT-Creation-Date: 2015-05-02 21:08+0200\n" +"PO-Revision-Date: 2015-06-17 09:56+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 17 Jun '15

17 Jun '15

commit 818eee188d18d21779ac668f9d5801bd83911f70 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 17 07:45:51 2015 +0000 Update translations for tails-misc --- fi.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi.po b/fi.po index 3fa5aec..867b42c 100644 --- a/fi.po +++ b/fi.po @@ -13,7 +13,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-17 00:40+0000\n" +"PO-Revision-Date: 2015-06-17 07:17+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n" "MIME-Version: 1.0\n"

1 0

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

17 Jun '15

commit 371a0cad121f243a56b9e4c0f23d290a3d0a23eb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 17 07:45:39 2015 +0000 Update translations for mat-gui_completed --- fi.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi.po b/fi.po index e323b77..b623da0 100644 --- a/fi.po +++ b/fi.po @@ -11,7 +11,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-02-23 08:18+0000\n" +"PO-Revision-Date: 2015-06-17 07:30+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n" "MIME-Version: 1.0\n"

1 0

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

17 Jun '15

commit 41e26e573770f3fdb3fa31ffd1c181bc06906929 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 17 07:45:35 2015 +0000 Update translations for mat-gui --- fi.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi.po b/fi.po index e323b77..b623da0 100644 --- a/fi.po +++ b/fi.po @@ -11,7 +11,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-02-23 08:18+0000\n" +"PO-Revision-Date: 2015-06-17 07:30+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n" "MIME-Version: 1.0\n"

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 17 Jun '15

17 Jun '15

commit 14b8b9bdb779190466a9b2b561d328eeb638dd86 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 17 07:15:10 2015 +0000 Update translations for gettor_completed --- nl/gettor.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nl/gettor.po b/nl/gettor.po index 8c35f43..1a980c7 100644 --- a/nl/gettor.po +++ b/nl/gettor.po @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-10-23 07:40+0000\n" -"Last-Translator: okpail <okpail(a)gmail.com>\n" +"PO-Revision-Date: 2015-06-17 07:08+0000\n" +"Last-Translator: Cleveridge <erwin.de.laat(a)cleveridge.org>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0