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

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 14 Aug '15

14 Aug '15

commit 74d5541aa4e076539ccee6834751966d00b2f43a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 14 16:45:15 2015 +0000 Update translations for https_everywhere --- nb/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nb/https-everywhere.dtd b/nb/https-everywhere.dtd index ddaac92..c8ff03e 100644 --- a/nb/https-everywhere.dtd +++ b/nb/https-everywhere.dtd @@ -17,7 +17,7 @@ <!ENTITY https-everywhere.menu.globalDisable "Deaktiver HTTPS Everywhere"> <!ENTITY https-everywhere.menu.blockHttpRequests "Sperr alle HTTP forespørsler"> <!ENTITY https-everywhere.menu.showCounter "Vis teller"> -<!ENTITY https-everywhere.menu.viewAllRules "View All Rules"> +<!ENTITY https-everywhere.menu.viewAllRules "Vis alle regler"> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Innstillinger"> <!ENTITY https-everywhere.prefs.enable_all "Aktiver Alle"> @@ -45,6 +45,6 @@ <!ENTITY https-everywhere.popup.keep "Hold meg på utvikler versjonen"> <!ENTITY https-everywhere.popup.revert "Last ned den siste stabile versjonen"> -<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Regelsett Test"> +<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Regelsett-tester"> <!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Avbryt"> <!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">

1 0

[tor/master] Increase AccountingMax example value to 40 GB.
by nickm＠torproject.org 14 Aug '15

14 Aug '15

commit 98b2a3b3d5b642849f08ad61ac3d05edc8910628 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 14 09:53:38 2015 -0400 Increase AccountingMax example value to 40 GB. (Change not made in torrc.minimal.in; only in torrc.sample and torrc.minimal.in-staging) Closes ticket 16742. --- changes/bug16742 | 3 +++ src/config/torrc.minimal.in-staging | 6 +++--- src/config/torrc.sample.in | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/changes/bug16742 b/changes/bug16742 new file mode 100644 index 0000000..2002cb7 --- /dev/null +++ b/changes/bug16742 @@ -0,0 +1,3 @@ + o Documentation: + - Recommend a 40 GB example AccountingMax in torrc.sample rather + than a 4 GB max. Closes ticket 16742. diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging index bde800f..d54a559 100644 --- a/src/config/torrc.minimal.in-staging +++ b/src/config/torrc.minimal.in-staging @@ -110,11 +110,11 @@ ## Use these to restrict the maximum traffic per day, week, or month. ## Note that this threshold applies separately to sent and received bytes, -## not to their sum: setting "4 GB" may allow up to 8 GB total before +## not to their sum: setting "40 GB" may allow up to 80 GB total before ## hibernating. ## -## Set a maximum of 4 gigabytes each way per period. -#AccountingMax 4 GBytes +## Set a maximum of 40 gigabytes each way per period. +#AccountingMax 40 GBytes ## Each period starts daily at midnight (AccountingMax is per day) #AccountingStart day 00:00 ## Each period starts on the 3rd of the month at 15:00 (AccountingMax diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index bde800f..d54a559 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -110,11 +110,11 @@ ## Use these to restrict the maximum traffic per day, week, or month. ## Note that this threshold applies separately to sent and received bytes, -## not to their sum: setting "4 GB" may allow up to 8 GB total before +## not to their sum: setting "40 GB" may allow up to 80 GB total before ## hibernating. ## -## Set a maximum of 4 gigabytes each way per period. -#AccountingMax 4 GBytes +## Set a maximum of 40 gigabytes each way per period. +#AccountingMax 40 GBytes ## Each period starts daily at midnight (AccountingMax is per day) #AccountingStart day 00:00 ## Each period starts on the 3rd of the month at 15:00 (AccountingMax

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 14 Aug '15

14 Aug '15

commit 4bd54f51f41969004e9563d97e40ebaa3547d120 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 14 13:16:34 2015 +0000 Update translations for tor-messenger-ircproperties --- nl/irc.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/irc.properties b/nl/irc.properties index c11047d..43b342b 100644 --- a/nl/irc.properties +++ b/nl/irc.properties @@ -80,7 +80,7 @@ command.whois2=%S [<nick>]: Get information on a user. # These are shown as system messages in the conversation. # %1$S is the nick and %2$S is the nick and host of the user who joined. message.join=%1$S [%2$S] entered the room. -message.rejoined=You have rejoined the room. +message.rejoined=Je bent de chatroom opnieuw binnengetreden # %1$S is the nick of who kicked you. # %2$S is message.kicked.reason, if a kick message was given. message.kicked.you=Je bent verwijderd door %1$S%2$S.

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 14 Aug '15

14 Aug '15

commit 05cba7ac4f781d2e6847618d457963a56c66fb04 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 14 13:15:25 2015 +0000 Update translations for https_everywhere_completed --- nl/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd index bfbe43a..5ccea04 100644 --- a/nl/https-everywhere.dtd +++ b/nl/https-everywhere.dtd @@ -17,6 +17,7 @@ <!ENTITY https-everywhere.menu.globalDisable "HTTPS Everywhere uitschakelen"> <!ENTITY https-everywhere.menu.blockHttpRequests "Blokkeer alle HTTP verzoeken"> <!ENTITY https-everywhere.menu.showCounter "Toon Teller"> +<!ENTITY https-everywhere.menu.viewAllRules "Toon Alle Regels"> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere-voorkeuren"> <!ENTITY https-everywhere.prefs.enable_all "Alles inschakelen">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 14 Aug '15

14 Aug '15

commit 543ebed34d28ef625a2eb1bdc4494c4225d561ac Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 14 13:15:20 2015 +0000 Update translations for https_everywhere --- nl/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd index b132052..5ccea04 100644 --- a/nl/https-everywhere.dtd +++ b/nl/https-everywhere.dtd @@ -17,7 +17,7 @@ <!ENTITY https-everywhere.menu.globalDisable "HTTPS Everywhere uitschakelen"> <!ENTITY https-everywhere.menu.blockHttpRequests "Blokkeer alle HTTP verzoeken"> <!ENTITY https-everywhere.menu.showCounter "Toon Teller"> -<!ENTITY https-everywhere.menu.viewAllRules "View All Rules"> +<!ENTITY https-everywhere.menu.viewAllRules "Toon Alle Regels"> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere-voorkeuren"> <!ENTITY https-everywhere.prefs.enable_all "Alles inschakelen">

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 14 Aug '15

14 Aug '15

commit d0357db1e5ec8a56bc712d49a2b24216a3a96c85 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 14 13:15:15 2015 +0000 Update translations for whisperback_completed --- nl/nl.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nl/nl.po b/nl/nl.po index 51bc2c7..9043c26 100644 --- a/nl/nl.po +++ b/nl/nl.po @@ -4,6 +4,7 @@ # # Translators: # JerBen <ayurveda63(a)gmail.com>, 2012 +# Jeroen Baert <jerbae(a)gmail.com>, 2015 # Shondoit Walker <shondoit(a)gmail.com>, 2012 # Marco Brohet <inactive+therbom(a)transifex.com>, 2012 # Tim E <darthim(a)hotmail.com>, 2013 @@ -13,9 +14,9 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-17 17:40+0100\n" -"PO-Revision-Date: 2015-06-19 21:02+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Dutch (http://www.transifex.com/projects/p/torproject/language/nl/)\n" +"PO-Revision-Date: 2015-08-14 12:48+0000\n" +"Last-Translator: Jeroen Baert <jerbae(a)gmail.com>\n" +"Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -26,7 +27,7 @@ msgstr "" #: ../whisperBack/whisperback.py:63 #, python-format msgid "Invalid contact email: %s" -msgstr "Ongeldig contact e-mail: %s" +msgstr "Ongeldige contact e-mail: %s" #: ../whisperBack/whisperback.py:80 #, python-format

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 14 Aug '15

14 Aug '15

commit f868cc2d2ffe00443f70ae810c312f0ae709883f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 14 13:15:11 2015 +0000 Update translations for whisperback --- nl/nl.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nl/nl.po b/nl/nl.po index 51bc2c7..9043c26 100644 --- a/nl/nl.po +++ b/nl/nl.po @@ -4,6 +4,7 @@ # # Translators: # JerBen <ayurveda63(a)gmail.com>, 2012 +# Jeroen Baert <jerbae(a)gmail.com>, 2015 # Shondoit Walker <shondoit(a)gmail.com>, 2012 # Marco Brohet <inactive+therbom(a)transifex.com>, 2012 # Tim E <darthim(a)hotmail.com>, 2013 @@ -13,9 +14,9 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-17 17:40+0100\n" -"PO-Revision-Date: 2015-06-19 21:02+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Dutch (http://www.transifex.com/projects/p/torproject/language/nl/)\n" +"PO-Revision-Date: 2015-08-14 12:48+0000\n" +"Last-Translator: Jeroen Baert <jerbae(a)gmail.com>\n" +"Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -26,7 +27,7 @@ msgstr "" #: ../whisperBack/whisperback.py:63 #, python-format msgid "Invalid contact email: %s" -msgstr "Ongeldig contact e-mail: %s" +msgstr "Ongeldige contact e-mail: %s" #: ../whisperBack/whisperback.py:80 #, python-format

1 0

[tor/master] Merge remote-tracking branch 'public/decouple_init_keys'
by nickm＠torproject.org 14 Aug '15

14 Aug '15

commit 34aefe6f38716ad88f07aa479f09008ed9d179b2 Merge: 810ef71 835e09e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 14 08:40:51 2015 -0400 Merge remote-tracking branch 'public/decouple_init_keys' changes/decouple_init_keys | 3 ++ src/or/main.c | 2 +- src/or/router.c | 68 ++++++++++++++++++++++++++++---------------- src/or/router.h | 1 + 4 files changed, 48 insertions(+), 26 deletions(-)

1 0

[tor/master] Split the client-only parts of init_keys() into a separate function
by nickm＠torproject.org 14 Aug '15

14 Aug '15

commit 835e09e54b07cac826e1d2efb450b0223e8a92ba Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 10:35:10 2015 -0400 Split the client-only parts of init_keys() into a separate function This should simplify the callgraph a little more. --- changes/decouple_init_keys | 3 ++ src/or/main.c | 2 +- src/or/router.c | 68 ++++++++++++++++++++++++++++---------------- src/or/router.h | 1 + 4 files changed, 48 insertions(+), 26 deletions(-) diff --git a/changes/decouple_init_keys b/changes/decouple_init_keys new file mode 100644 index 0000000..7f48d2b --- /dev/null +++ b/changes/decouple_init_keys @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Move the client-only parts of init_keys() into a separate function. + Closes ticket 16763. diff --git a/src/or/main.c b/src/or/main.c index e564e6c..c6dcd2a 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1888,7 +1888,7 @@ ip_address_changed(int at_interface) if (at_interface) { if (! server) { /* Okay, change our keys. */ - if (init_keys()<0) + if (init_keys_client() < 0) log_warn(LD_GENERAL, "Unable to rotate keys after IP change!"); } } else { diff --git a/src/or/router.c b/src/or/router.c index 47825e2..03973ae 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -767,6 +767,46 @@ router_write_fingerprint(int hashed) return result; } +static int +init_keys_common(void) +{ + if (!key_lock) + key_lock = tor_mutex_new(); + + /* There are a couple of paths that put us here before we've asked + * openssl to initialize itself. */ + if (crypto_global_init(get_options()->HardwareAccel, + get_options()->AccelName, + get_options()->AccelDir)) { + log_err(LD_BUG, "Unable to initialize OpenSSL. Exiting."); + return -1; + } + + return 0; +} + +int +init_keys_client(void) +{ + crypto_pk_t *prkey; + if (init_keys_common() < 0) + return -1; + + if (!(prkey = crypto_pk_new())) + return -1; + if (crypto_pk_generate_key(prkey)) { + crypto_pk_free(prkey); + return -1; + } + set_client_identity_key(prkey); + /* Create a TLS context. */ + if (router_initialize_tls_context() < 0) { + log_err(LD_GENERAL,"Error creating TLS context for Tor client."); + return -1; + } + return 0; +} + /** Initialize all OR private keys, and the TLS context, as necessary. * On OPs, this only initializes the tls context. Return 0 on success, * or -1 if Tor should die. @@ -786,35 +826,13 @@ init_keys(void) int v3_digest_set = 0; authority_cert_t *cert = NULL; - if (!key_lock) - key_lock = tor_mutex_new(); - - /* There are a couple of paths that put us here before we've asked - * openssl to initialize itself. */ - if (crypto_global_init(get_options()->HardwareAccel, - get_options()->AccelName, - get_options()->AccelDir)) { - log_err(LD_BUG, "Unable to initialize OpenSSL. Exiting."); - return -1; - } - /* OP's don't need persistent keys; just make up an identity and * initialize the TLS context. */ if (!server_mode(options)) { - if (!(prkey = crypto_pk_new())) - return -1; - if (crypto_pk_generate_key(prkey)) { - crypto_pk_free(prkey); - return -1; - } - set_client_identity_key(prkey); - /* Create a TLS context. */ - if (router_initialize_tls_context() < 0) { - log_err(LD_GENERAL,"Error creating TLS context for Tor client."); - return -1; - } - return 0; + return init_keys_client(); } + if (init_keys_common() < 0) + return -1; /* Make sure DataDirectory exists, and is private. */ if (check_private_dir(options->DataDirectory, CPD_CREATE, options->User)) { return -1; diff --git a/src/or/router.h b/src/or/router.h index 61b35d6..d8fcf0a 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -37,6 +37,7 @@ void ntor_key_map_free(di_digest256_map_t *map); int router_initialize_tls_context(void); int init_keys(void); +int init_keys_client(void); int check_whether_orport_reachable(void); int check_whether_dirport_reachable(void);

1 0

[tor/master] Fix an overzealous compiler warning in the tests
by nickm＠torproject.org 14 Aug '15

14 Aug '15

commit 05d52899cbdc7a16d4e9b93555a081d16b06d96b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 14 08:48:26 2015 -0400 Fix an overzealous compiler warning in the tests --- src/test/test.h | 9 +++++++++ src/test/test_containers.c | 12 ++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/test/test.h b/src/test/test.h index b0c0946..86699c3 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -40,6 +40,15 @@ tt_assert_test_type(a,b,#a" "#op" "#b,double,(val1_ op val2_),"%g", \ TT_EXIT_TEST_FUNCTION) +/* Declare "double equal" in a sneaky way, so compiler won't complain about + * comparing floats with == or !=. Of course, only do this if you know what + * you're doing. */ +#define tt_double_eq(a,b) \ + STMT_BEGIN \ + tt_double_op((a), >=, (b)); \ + tt_double_op((a), <=, (b)); \ + STMT_END + #ifdef _MSC_VER #define U64_PRINTF_TYPE uint64_t #define I64_PRINTF_TYPE int64_t diff --git a/src/test/test_containers.c b/src/test/test_containers.c index eb98cc8..1ee240f 100644 --- a/src/test/test_containers.c +++ b/src/test/test_containers.c @@ -934,12 +934,12 @@ test_container_order_functions(void *arg) #undef third_quartile double dbls[] = { 1.0, 10.0, 100.0, 1e4, 1e5, 1e6 }; - tt_assert(1.0 == median_double(dbls, 1)); - tt_assert(1.0 == median_double(dbls, 2)); - tt_assert(10.0 == median_double(dbls, 3)); - tt_assert(10.0 == median_double(dbls, 4)); - tt_assert(100.0 == median_double(dbls, 5)); - tt_assert(100.0 == median_double(dbls, 6)); + tt_double_eq(1.0, median_double(dbls, 1)); + tt_double_eq(1.0, median_double(dbls, 2)); + tt_double_eq(10.0, median_double(dbls, 3)); + tt_double_eq(10.0, median_double(dbls, 4)); + tt_double_eq(100.0, median_double(dbls, 5)); + tt_double_eq(100.0, median_double(dbls, 6)); time_t times[] = { 5, 10, 20, 25, 15 };

1 0