September 2016 - tor-commits - lists.torproject.org

[translation/tor-messenger-conversationsproperties] Update translations for tor-messenger-conversationsproperties
by translation＠torproject.org 08 Sep '16

08 Sep '16

commit 1898245e57c575ab6562aa284f4a26c214be4565 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 8 14:47:28 2016 +0000 Update translations for tor-messenger-conversationsproperties --- fi/conversations.properties | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/fi/conversations.properties b/fi/conversations.properties index c0ca279..ce9059b 100644 --- a/fi/conversations.properties +++ b/fi/conversations.properties @@ -30,10 +30,10 @@ statusKnown=Tilinne on yhdistetty uudelleen (%1$S on %2$S). statusKnownWithStatusText=Tilinne on yhdistetty uudelleen (%1$S on %2$S: %3$S). # LOCALIZATION NOTE (statusUnknown): # %S is the display name of the contact. -statusUnknown=Your account is disconnected (the status of %S is no longer known). +statusUnknown=Tilinne yhteys on katkaistu (%S-tilaa ei enää tunneta). accountDisconnected=Tilinne yhteys on katkaistu. -accountReconnected=Tilinne yhteys on uudelleen yhdistetty. +accountReconnected=Tilinne yhteys on yhdistetty uudelleen. # LOCALIZATION NOTE (autoReply): # %S is replaced by the text of a message that was sent as an automatic reply. @@ -45,27 +45,27 @@ noTopic=Aihe puuttuu tästä huoneesta. # LOCALIZATION NOTE (topicSet): # %1$S is the conversation name, %2$S is the topic. -topicSet=The topic for %1$S is: %2$S. +topicSet=Aihe kohteelle %1$S on: %2$S. # LOCALIZATION NOTE (topicNotSet): # %S is the conversation name. -topicNotSet=There is no topic for %S. +topicNotSet=Kohteelle %S ei ole aihetta. # LOCALIZATION NOTE (topicChanged): # %1$S is the user who changed the topic, %2$S is the new topic. -topicChanged=%1$S has changed the topic to: %2$S. +topicChanged=%1$S on vaihtanut aiheeksi: %2$S. # LOCALIZATION NOTE (topicCleared): # %1$S is the user who cleared the topic. -topicCleared=%1$S has cleared the topic. +topicCleared=%1$S on hävittänyt aiheen. # LOCALIZATION NOTE (nickSet): # This is displayed as a system message when a participant changes his/her # nickname in a conversation. # %1$S is the old nick. # %2$S is the new nick. -nickSet=%1$S is now known as %2$S. +nickSet=%1$S tunnetaan nyt nimellä %2$S. # LOCALIZATION NOTE (nickSet.you): # This is displayed as a system message when your nickname is changed. # %S is your new nick. -nickSet.you=You are now known as %S. +nickSet.you=Sinut tunnetaan nimellä %S. # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis): # ellipsis is used when copying a part of a message to show that the message was cut @@ -77,4 +77,4 @@ messenger.conversations.selections.ellipsis=[…] # whitespace and separators to make them fit your locale. messenger.conversations.selections.systemMessagesTemplate=%aika% - %viesti% messenger.conversations.selections.contentMessagesTemplate=%aika% - %lähettäjä%: %viesti% -messenger.conversations.selections.actionMessagesTemplate=%time% * %sender% %message% +messenger.conversations.selections.actionMessagesTemplate=%aika% * %lähettäjä% %viesti%

1 0

[tor/master] Remove redundant definitions of expect_{no_, }log_msg()
by nickm＠torproject.org 08 Sep '16

08 Sep '16

commit ae3ea9a7a1ff0733d6e80734cd984495aeac6247 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 8 10:32:59 2016 -0400 Remove redundant definitions of expect_{no_,}log_msg() --- src/test/test_options.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index 87f8966..2748f42 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -394,14 +394,6 @@ free_options_test_data(options_test_data_t *td) tor_free(td); } -#define expect_log_msg(str) \ - tt_assert_msg(mock_saved_log_has_message(str), \ - "expected log to contain " # str); - -#define expect_no_log_msg(str) \ - tt_assert_msg(!mock_saved_log_has_message(str), \ - "expected log to not contain " # str); - static void test_options_validate__uname_for_server(void *ignored) {

1 0

[tor/master] Revise log-testing macros to dump the actual log contents on failure
by nickm＠torproject.org 08 Sep '16

08 Sep '16

commit 3705ee8fe4771be7b3dce0530cddecf26cff45ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 8 10:33:01 2016 -0400 Revise log-testing macros to dump the actual log contents on failure --- src/test/log_test_helpers.c | 15 +++++++++++++++ src/test/log_test_helpers.h | 28 +++++++++++++++++++--------- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c index 1ad008a..5eba566 100644 --- a/src/test/log_test_helpers.c +++ b/src/test/log_test_helpers.c @@ -210,3 +210,18 @@ mock_saving_logv(int severity, log_domain_mask_t domain, smartlist_add(saved_logs, e); } +void +mock_dump_saved_logs(void) +{ + if (saved_logs == NULL) { + puts(" Captured logs: NULL"); + return; + } + + puts(" Captured logs:"); + SMARTLIST_FOREACH_BEGIN(saved_logs, const mock_saved_log_entry_t *, m) { + printf("% 5d. %s: %s\n", m_sl_idx + 1, + log_level_to_string(m->severity), + escaped(m->generated_msg)); + } SMARTLIST_FOREACH_END(m); +} diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h index f33ee67..5685ddb 100644 --- a/src/test/log_test_helpers.h +++ b/src/test/log_test_helpers.h @@ -26,40 +26,50 @@ int mock_saved_log_has_message(const char *msg); int mock_saved_log_has_message_containing(const char *msg); int mock_saved_log_has_severity(int severity); int mock_saved_log_has_entry(void); +void mock_dump_saved_logs(void); -#define expect_log_msg(str) \ - tt_assert_msg(mock_saved_log_has_message(str), \ +#define assert_log_predicate(predicate, failure_msg) \ + do { \ + if (!(predicate)) { \ + tt_fail_msg((failure_msg)); \ + mock_dump_saved_logs(); \ + TT_EXIT_TEST_FUNCTION; \ + } \ + } while (0) + +#define expect_log_msg(str) \ + assert_log_predicate(mock_saved_log_has_message(str), \ "expected log to contain " # str); #define expect_log_msg_containing(str) \ - tt_assert_msg(mock_saved_log_has_message_containing(str), \ + assert_log_predicate(mock_saved_log_has_message_containing(str), \ "expected log to contain " # str); #define expect_single_log_msg_containing(str) \ do { \ - tt_assert_msg(mock_saved_log_has_message_containing(str), \ + assert_log_predicate(mock_saved_log_has_message_containing(str), \ "expected log to contain " # str); \ tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1); \ } while (0); #define expect_no_log_msg(str) \ - tt_assert_msg(!mock_saved_log_has_message(str), \ + assert_log_predicate(!mock_saved_log_has_message(str), \ "expected log to not contain " # str); #define expect_log_severity(severity) \ - tt_assert_msg(mock_saved_log_has_severity(severity), \ + assert_log_predicate(mock_saved_log_has_severity(severity), \ "expected log to contain severity " # severity); #define expect_no_log_severity(severity) \ - tt_assert_msg(!mock_saved_log_has_severity(severity), \ + assert_log_predicate(!mock_saved_log_has_severity(severity), \ "expected log to not contain severity " # severity); #define expect_log_entry() \ - tt_assert_msg(mock_saved_log_has_entry(), \ + assert_log_predicate(mock_saved_log_has_entry(), \ "expected log to contain entries"); #define expect_no_log_entry() \ - tt_assert_msg(!mock_saved_log_has_entry(), \ + assert_log_predicate(!mock_saved_log_has_entry(), \ "expected log to not contain entries"); #endif

1 0

[tor/master] Fix libevent linking on openbsd.
by nickm＠torproject.org 08 Sep '16

08 Sep '16

commit fe9cfeba6ec96c11d009f4d57bf03f0019e34c9d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 8 10:08:29 2016 -0400 Fix libevent linking on openbsd. Closes ticket 19902; bugfix on 0.2.9.1-alpha; patch from rubiate --- changes/bug19902 | 5 +++++ configure.ac | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug19902 b/changes/bug19902 new file mode 100644 index 0000000..297570e --- /dev/null +++ b/changes/bug19902 @@ -0,0 +1,5 @@ + o Major bugfixes (compilation, OpenBSD): + + - Fix a Libevent-detection bug in our autoconf script that would + prevent Tor from linking successfully on OpenBSD. Patch from + rubiate. Fixes bug 19902; bugfix on 0.2.9.1-alpha. diff --git a/configure.ac b/configure.ac index ed57757..fc27017 100644 --- a/configure.ac +++ b/configure.ac @@ -501,6 +501,8 @@ AC_CHECK_FUNCS([evutil_secure_rng_set_urandom_device_file \ evutil_secure_rng_add_bytes \ ]) +AC_CHECK_HEADERS(event2/event.h event2/dns.h event2/bufferevent_ssl.h) + LIBS="$STATIC_LIBEVENT_FLAGS $TOR_LIB_WS32 $save_LIBS" if test "$enable_static_libevent" = "yes"; then @@ -521,7 +523,7 @@ else TOR_LIBEVENT_LIBS="$ac_cv_search_evdns_base_new $TOR_LIBEVENT_LIBS" fi else - TOR_LIBEVENT_LIBS="-levent" + AC_MSG_ERROR("libevent2 is required but the headers could not be found") fi fi

1 0

[tor/master] Disable -Wthread-safety.
by nickm＠torproject.org 08 Sep '16

08 Sep '16

commit f3cda3272a2504f8ffd66e1a5625c268ce660f4c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 8 09:37:40 2016 -0400 Disable -Wthread-safety. See changes file; closes ticket 20110. --- changes/bug20110 | 6 ++++++ configure.ac | 13 ++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/changes/bug20110 b/changes/bug20110 new file mode 100644 index 0000000..bb56a13 --- /dev/null +++ b/changes/bug20110 @@ -0,0 +1,6 @@ + o Minor bugfixes (compilation): + + - Stop trying to build with Clang 4.0's -Wthread-safety + warnings. They apparently require a set of annotations that we + aren't currently using, and they create false positives in our + pthreads wrappers. Fixes bug 20110; bugfix on 0.2.9.1-alpha. diff --git a/configure.ac b/configure.ac index a90c15c..ed57757 100644 --- a/configure.ac +++ b/configure.ac @@ -1800,11 +1800,6 @@ if test "x$enable_gcc_warnings_advisory" != "xno"; then -Wsync-nand -Wtautological-constant-out-of-range-compare -Wtentative-definition-incomplete-type - -Wthread-safety - -Wthread-safety-analysis - -Wthread-safety-attributes - -Wthread-safety-beta - -Wthread-safety-precise -Wtrampolines -Wtype-safety -Wtypedef-redefinition @@ -1838,6 +1833,14 @@ if test "x$enable_gcc_warnings_advisory" != "xno"; then -Wzero-length-array ], [ TOR_CHECK_CFLAGS([warning_flag]) ]) +dnl These seem to require annotations that we don't currently use, +dnl and they give false positives in our pthreads wrappers. (Clang 4) +dnl -Wthread-safety +dnl -Wthread-safety-analysis +dnl -Wthread-safety-attributes +dnl -Wthread-safety-beta +dnl -Wthread-safety-precise + CFLAGS="$CFLAGS -W -Wfloat-equal -Wundef -Wpointer-arith" CFLAGS="$CFLAGS -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings" CFLAGS="$CFLAGS -Wredundant-decls -Wchar-subscripts -Wcomment -Wformat=2"

1 0

[tor/master] Unit test fix: windows should be able to handle DNSPort just fine.
by nickm＠torproject.org 08 Sep '16

08 Sep '16

commit 8acb951fc823e985218ef86dce1939f106febf7e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 8 09:23:20 2016 -0400 Unit test fix: windows should be able to handle DNSPort just fine. --- src/test/test_config.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index 80a1727..c1222e5 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4011,9 +4011,6 @@ test_config_parse_port_config__ports__ports_given(void *data) ret = parse_port_config(slout, config_port_valid, NULL, "DNS", CONN_TYPE_AP_DNS_LISTENER, NULL, 0, CL_PORT_TAKES_HOSTNAMES); -#ifdef _WIN32 - tt_int_op(ret, OP_EQ, -1); -#else tt_int_op(ret, OP_EQ, 0); tt_int_op(smartlist_len(slout), OP_EQ, 1); port_cfg = (port_cfg_t *)smartlist_get(slout, 0); @@ -4021,7 +4018,6 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(port_cfg->entry_cfg.ipv4_traffic, OP_EQ, 0); tt_int_op(port_cfg->entry_cfg.ipv6_traffic, OP_EQ, 0); tt_int_op(port_cfg->entry_cfg.onion_traffic, OP_EQ, 0); -#endif // Test failure if we have DNS but no ipv4 and no ipv6 config_free_lines(config_port_invalid); config_port_invalid = NULL;

1 0

[translation/tor-messenger-fingerdtd_completed] Update translations for tor-messenger-fingerdtd_completed
by translation＠torproject.org 08 Sep '16

08 Sep '16

commit 42d262f068c7c4898b3be615c46aaa92b7118fa1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 8 13:17:42 2016 +0000 Update translations for tor-messenger-fingerdtd_completed --- fi/finger.dtd | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/fi/finger.dtd b/fi/finger.dtd index 1b0a7c4..fbd3ba7 100644 --- a/fi/finger.dtd +++ b/fi/finger.dtd @@ -1,10 +1,15 @@ -<!ENTITY finger.title "Tunnetut sormenjäljet"> +<!ENTITY finger.title "Tunnetut tunnisteet"> <!ENTITY finger.screenName "Näyttönimi"> <!ENTITY finger.status "Tila"> <!ENTITY finger.verified "Todennettu"> <!ENTITY finger.fingerprint "Tunniste"> <!ENTITY finger.account "Tili"> -<!ENTITY finger.protocol "Protokolla"> +<!ENTITY finger.protocol "Yhteyskäytäntö"> <!ENTITY finger.verify "Todenna"> <!ENTITY finger.remove "Poista"> -<!ENTITY finger.intro "Hallitse näkemiesi sormenjälkien listaa."> \ No newline at end of file +<!ENTITY finger.intro "Hallinnoi näkemiesi tunnisteiden luetteloa."> +<!ENTITY addFingerDialog.title "Lisää tunniste"> +<!ENTITY addFingerDialog.finger "Tunniste"> +<!ENTITY addFingerDialog.accept "Valmis"> +<!ENTITY addFingerDialog.cancel "Ohita"> +<!ENTITY addFingerDialog.tooltip "Jos tiedät yhteyshenkilösi OTR-yksityisavaimen 40:stä heksadesimaaliluvusta muodostuvan tunnisteen, kirjoita se nyt."> \ No newline at end of file

1 0

[translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd
by translation＠torproject.org 08 Sep '16

08 Sep '16

commit 70fcc22ab1087992718a10f82e1c052c23e44950 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 8 13:17:39 2016 +0000 Update translations for tor-messenger-fingerdtd --- fi/finger.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fi/finger.dtd b/fi/finger.dtd index 9b60a30..fbd3ba7 100644 --- a/fi/finger.dtd +++ b/fi/finger.dtd @@ -1,15 +1,15 @@ -<!ENTITY finger.title "Tunnetut sormenjäljet"> +<!ENTITY finger.title "Tunnetut tunnisteet"> <!ENTITY finger.screenName "Näyttönimi"> <!ENTITY finger.status "Tila"> <!ENTITY finger.verified "Todennettu"> <!ENTITY finger.fingerprint "Tunniste"> <!ENTITY finger.account "Tili"> -<!ENTITY finger.protocol "Protokolla"> +<!ENTITY finger.protocol "Yhteyskäytäntö"> <!ENTITY finger.verify "Todenna"> <!ENTITY finger.remove "Poista"> -<!ENTITY finger.intro "Hallitse näkemiesi sormenjälkien listaa."> -<!ENTITY addFingerDialog.title "Lisää Tunniste"> +<!ENTITY finger.intro "Hallinnoi näkemiesi tunnisteiden luetteloa."> +<!ENTITY addFingerDialog.title "Lisää tunniste"> <!ENTITY addFingerDialog.finger "Tunniste"> -<!ENTITY addFingerDialog.accept "OK"> +<!ENTITY addFingerDialog.accept "Valmis"> <!ENTITY addFingerDialog.cancel "Ohita"> -<!ENTITY addFingerDialog.tooltip "If you know the 40 hex char fingerprint of your contact's OTR private key, enter it now."> \ No newline at end of file +<!ENTITY addFingerDialog.tooltip "Jos tiedät yhteyshenkilösi OTR-yksityisavaimen 40:stä heksadesimaaliluvusta muodostuvan tunnisteen, kirjoita se nyt."> \ No newline at end of file

1 0

[torspec/master] Merge branch 'ticket20089_squashed'
by nickm＠torproject.org 08 Sep '16

08 Sep '16

commit dda7a944a1eb5fb958c9e9e24770cb74b19e0213 Merge: 04ee910 dca09fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 8 09:15:23 2016 -0400 Merge branch 'ticket20089_squashed' dir-spec.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)

1 0

[torspec/master] Specify "p" lines in a consensus as required
by nickm＠torproject.org 08 Sep '16

08 Sep '16

commit dca09fda52993babfc00d3e76e681913450d5f82 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Sep 6 21:06:35 2016 +0200 Specify "p" lines in a consensus as required This is motivated to remove an ambiguity about what a missing "p" line means when comparing historical consensus data. --- dir-spec.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index db1378f..d5e8376 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1369,16 +1369,17 @@ "p" SP ("accept" / "reject") SP PortList NL - [At most once] + [Exactly once.] - The exit-policy summary as specified in sections 3.4.1 and 3.8.2. A - missing "p" line is equivalent to "p reject 1-65535". + The exit-policy summary as specified in sections 3.4.1 and 3.8.2. [With microdescriptors, clients don't learn exact exit policies: clients can only guess whether a relay accepts their request, try the BEGIN request, and might get end-reason-exit-policy if they guessed wrong, in which case they'll have to try elsewhere.] + [In consensus methods before 5, this line was omitted.] + "p6" SP ("accept" / "reject") SP PortList NL [At most once]

1 0