December 2019 - tor-commits - lists.torproject.org

[tor/master] Travis: Disable the macOS Rust job
by teor＠torproject.org 15 Dec '19

15 Dec '19

commit 6558bb4460f360ee16653d9430ee00e969f3adf7 Author: teor <teor(a)torproject.org> Date: Sun Dec 1 20:25:00 2019 +1000 Travis: Disable the macOS Rust job This time, we're disabling it because it's the lowest priority job. (And also slow.) Part of 32629. --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 21c86ad93..bdcd94f91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,10 +62,13 @@ matrix: - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" ## We check disable module dirauth - env: MODULES_OPTIONS="--disable-module-dirauth" + ## macOS builds are very slow, and we have a limited number of + ## concurrent macOS jobs. We're not actively developing Rust, so it is + ## the lowest priority. ## We run rust on macOS, because we have seen macOS rust failures before - - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" - compiler: clang - os: osx + #- env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + # compiler: clang + # os: osx ## We run chutney on macOS, because macOS Travis has IPv6 - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" os: osx

1 0

[tor/master] Merge branch 'ticket32629_035' into ticket32629_040
by teor＠torproject.org 15 Dec '19

15 Dec '19

commit 349554f40d503a33f4b85c8481ca1434ac07acbf Merge: 055f5d4d1 6558bb446 Author: teor <teor(a)torproject.org> Date: Sun Dec 1 20:26:51 2019 +1000 Merge branch 'ticket32629_035' into ticket32629_040 .travis.yml | 9 +++++---- changes/ticket32177 | 3 --- 2 files changed, 5 insertions(+), 7 deletions(-)

1 0

[tor/master] Revert "Travis: Disable the Rust macOS build"
by teor＠torproject.org 15 Dec '19

15 Dec '19

commit 453e092e521626420fb679ad99fade0dd1c9af88 Author: teor <teor(a)torproject.org> Date: Thu Nov 28 12:11:37 2019 +1000 Revert "Travis: Disable the Rust macOS build" This reverts commit 4c4a0d50ff4fd01862b78e8cbfaabfa9e4d4ae12. --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7f0e78587..35c3502e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,10 +63,9 @@ matrix: ## We check disable module dirauth - env: MODULES_OPTIONS="--disable-module-dirauth" ## We run rust on macOS, because we have seen macOS rust failures before - # Disabled due to slow Travis macOS builds, see #32177 - #- env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" - # compiler: clang - # os: osx + - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + compiler: clang + os: osx ## We run chutney on macOS, because macOS Travis has IPv6 # Disabled due to slow Travis macOS builds, see #32177 #- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"

1 0

[tor/master] Merge branch 'ticket32629_041' into ticket32629_042
by teor＠torproject.org 15 Dec '19

15 Dec '19

commit 4a157c7569c6ad5e37747852a823369b48229ef7 Merge: eb8170408 a00b9e5a8 Author: teor <teor(a)torproject.org> Date: Sun Dec 1 20:28:44 2019 +1000 Merge branch 'ticket32629_041' into ticket32629_042 Merge RUST_VERSION from maint-0.4.2 with disabling the macOS Rust job from ticket32629_041. .travis.yml | 9 +++++---- changes/ticket32177 | 3 --- 2 files changed, 5 insertions(+), 7 deletions(-) diff --cc .travis.yml index 252da6877,c56ced37b..f386500b2 --- a/.travis.yml +++ b/.travis.yml @@@ -64,9 -62,11 +64,11 @@@ matrix - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" ## We check disable module dirauth - env: MODULES_OPTIONS="--disable-module-dirauth" + ## macOS builds are very slow, and we have a limited number of + ## concurrent macOS jobs. We're not actively developing Rust, so it is + ## the lowest priority. ## We run rust on macOS, because we have seen macOS rust failures before - # Disabled due to slow Travis macOS builds, see #32177 - #- env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + #- env: RUST_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" # compiler: clang # os: osx ## We run chutney on macOS, because macOS Travis has IPv6

1 0

[tor/master] Merge branch 'ticket32629_040' into ticket32629_041
by teor＠torproject.org 15 Dec '19

15 Dec '19

commit a00b9e5a86dd763e8d21958dc9022472f40a18d8 Merge: 26071aa3b 349554f40 Author: teor <teor(a)torproject.org> Date: Sun Dec 1 20:26:55 2019 +1000 Merge branch 'ticket32629_040' into ticket32629_041 .travis.yml | 9 +++++---- changes/ticket32177 | 3 --- 2 files changed, 5 insertions(+), 7 deletions(-)

1 0

[tor/master] changes: file for 32629
by teor＠torproject.org 15 Dec '19

15 Dec '19

commit a277f28947900fc2018f634078bf59eae166c75a Author: teor <teor(a)torproject.org> Date: Fri Dec 6 10:51:05 2019 +1000 changes: file for 32629 --- changes/ticket32629 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket32629 b/changes/ticket32629 new file mode 100644 index 000000000..740746c57 --- /dev/null +++ b/changes/ticket32629 @@ -0,0 +1,4 @@ + o Testing: + - Re-enable the Travis CI macOS Chutney build, but allow the job to finish + before it finishes, because the Travis macOS jobs are slow. + Closes ticket 32629.

1 0

[tor/master] changes: file for 32629
by teor＠torproject.org 15 Dec '19

15 Dec '19

commit b84e7715daba5bdcb20fa3f1148d2c518ea5704c Author: teor <teor(a)torproject.org> Date: Fri Dec 6 10:51:05 2019 +1000 changes: file for 32629 --- changes/ticket32629 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket32629 b/changes/ticket32629 new file mode 100644 index 000000000..740746c57 --- /dev/null +++ b/changes/ticket32629 @@ -0,0 +1,4 @@ + o Testing: + - Re-enable the Travis CI macOS Chutney build, but allow the job to finish + before it finishes, because the Travis macOS jobs are slow. + Closes ticket 32629.

1 0

[tor/master] changes: file for 32629
by teor＠torproject.org 15 Dec '19

15 Dec '19

commit f86d508d49dd36fede7091635044603741fdd353 Author: teor <teor(a)torproject.org> Date: Fri Dec 6 10:51:05 2019 +1000 changes: file for 32629 --- changes/ticket32629 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket32629 b/changes/ticket32629 new file mode 100644 index 000000000..740746c57 --- /dev/null +++ b/changes/ticket32629 @@ -0,0 +1,4 @@ + o Testing: + - Re-enable the Travis CI macOS Chutney build, but allow the job to finish + before it finishes, because the Travis macOS jobs are slow. + Closes ticket 32629.

1 0

[tor/master] clean up kvline_can_encode_lines()
by teor＠torproject.org 15 Dec '19

15 Dec '19

commit 4b22c739fe8b04b05e7bdfdf18ec42ec4bf1c436 Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed Jul 3 15:13:51 2019 -0500 clean up kvline_can_encode_lines() Add a check for '=' characters in needs_escape(). This simplifies the logic in kvline_can_encode_lines(). Part of #30984. --- src/lib/encoding/kvline.c | 28 +++++++++++++--------------- src/test/test_config.c | 22 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/src/lib/encoding/kvline.c b/src/lib/encoding/kvline.c index d4a8f510b..e56b57b4c 100644 --- a/src/lib/encoding/kvline.c +++ b/src/lib/encoding/kvline.c @@ -29,12 +29,20 @@ #include <string.h> /** Return true iff we need to quote and escape the string <b>s</b> to encode - * it. */ + * it. + * + * kvline_can_encode_lines() also uses this (with + * <b>as_keyless_val</b> true) to check whether a key would require + * quoting. + */ static bool needs_escape(const char *s, bool as_keyless_val) { if (as_keyless_val && *s == 0) return true; + /* Keyless values containing '=' need to be escaped. */ + if (as_keyless_val && strchr(s, '=')) + return true; for (; *s; ++s) { if (*s >= 127 || TOR_ISSPACE(*s) || ! TOR_ISPRINT(*s) || @@ -72,23 +80,16 @@ kvline_can_encode_lines(const config_line_t *line, unsigned flags) { for ( ; line; line = line->next) { const bool keyless = line_has_no_key(line); - if (keyless) { - if (! (flags & KV_OMIT_KEYS)) { - /* If KV_OMIT_KEYS is not set, we can't encode a line with no key. */ - return false; - } - if (strchr(line->value, '=') && !( flags & KV_QUOTED)) { - /* We can't have a keyless value with = without quoting it. */ - return false; - } + if (keyless && ! (flags & KV_OMIT_KEYS)) { + /* If KV_OMIT_KEYS is not set, we can't encode a line with no key. */ + return false; } if (needs_escape(line->value, keyless) && ! (flags & KV_QUOTED)) { /* If KV_QUOTED is false, we can't encode a value that needs quotes. */ return false; } - if (line->key && strlen(line->key) && - (needs_escape(line->key, false) || strchr(line->key, '='))) { + if (!keyless && needs_escape(line->key, true)) { /* We can't handle keys that need quoting. */ return false; } @@ -142,9 +143,6 @@ kvline_encode(const config_line_t *line, k = line->key; } else { eq = ""; - if (strchr(line->value, '=')) { - esc = true; - } } if ((flags & KV_OMIT_VALS) && line_has_no_val(line)) { diff --git a/src/test/test_config.c b/src/test/test_config.c index a75a86273..6294e21f0 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -6050,6 +6050,28 @@ test_config_kvline_parse(void *arg) tt_str_op(lines->next->next->value, OP_EQ, "I"); enc = kvline_encode(lines, KV_OMIT_VALS|KV_QUOTED); tt_str_op(enc, OP_EQ, "AB=\"CD E\" DE FGH=I"); + tor_free(enc); + config_free_lines(lines); + + lines = kvline_parse("AB=CD \"EF=GH\"", KV_OMIT_KEYS|KV_QUOTED); + tt_assert(lines); + tt_str_op(lines->key, OP_EQ, "AB"); + tt_str_op(lines->value, OP_EQ, "CD"); + tt_str_op(lines->next->key, OP_EQ, ""); + tt_str_op(lines->next->value, OP_EQ, "EF=GH"); + enc = kvline_encode(lines, KV_OMIT_KEYS); + tt_assert(!enc); + enc = kvline_encode(lines, KV_OMIT_KEYS|KV_QUOTED); + tt_assert(enc); + tt_str_op(enc, OP_EQ, "AB=CD \"EF=GH\""); + tor_free(enc); + config_free_lines(lines); + + lines = tor_malloc_zero(sizeof(*lines)); + lines->key = tor_strdup("A=B"); + lines->value = tor_strdup("CD"); + enc = kvline_encode(lines, 0); + tt_assert(!enc); done: config_free_lines(lines);

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 15 Dec '19

15 Dec '19

commit d9ea4449f6bc28af7501b7cbe801e93a099a4d1e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 15 18:45:29 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ka.po | 53 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index 240c71ce14..65a3d61397 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -917,6 +917,9 @@ msgid "" "Ideal exit relay operators are affiliated with some institution, like a " "university, a library, a hackerspace or a privacy related organization." msgstr "" +"სასურველია, რომ გადამცემს იმართებოდეს რამე დაწესებულების მეშვეობით, " +"როგორიცაა უნივერსიტეტი, ბიბლიოთეკა, საგანმანათლებლო სივრცეები ან პირადი " +"მონაცემების უსაფრთხოების საკითხებთან დაკავშირებული სხვა ორგანიზაციები." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -936,7 +939,7 @@ msgstr "" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) msgid "# Bridge" -msgstr "" +msgstr "# გადამცემი ხიდი" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -1010,7 +1013,7 @@ msgstr "" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.title) msgid "Community and legal resources" -msgstr "" +msgstr "ერთობა და სამართლებრივი მასალები" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.subtitle) @@ -1023,7 +1026,7 @@ msgstr "" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "# Legal resources" -msgstr "" +msgstr "# სამართლებრივი მასალები" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1082,11 +1085,13 @@ msgstr "" #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "Also see the [Tor Exit Guidelines](tor-exit-guidelines)." msgstr "" +"აგრეთვე, იხილეთ [Tor-ის გამავალი კვანძის სახელმძღვანელო](tor-exit-" +"guidelines)." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "# Responding to abuse complaints" -msgstr "" +msgstr "# პასუხი საჩივრებზე დარღვევების შესახებ" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1114,7 +1119,7 @@ msgstr "" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "Other docs we like:" -msgstr "" +msgstr "სხვა სასურველი დოკუმენტები:" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1137,7 +1142,7 @@ msgstr "" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "# Running a relay with other people" -msgstr "" +msgstr "# გადამცემის გაშვება სხვების დახმარებით" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1150,7 +1155,7 @@ msgstr "" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "## Torservers.net" -msgstr "" +msgstr "## Torservers.net" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1320,7 +1325,7 @@ msgstr "" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "# Other resources" -msgstr "" +msgstr "# სხვა სასარგებლო მასალები" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1353,7 +1358,7 @@ msgstr "" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.title) msgid "Technical considerations" -msgstr "" +msgstr "ტექნიკური საკითხები" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.subtitle) @@ -1470,7 +1475,7 @@ msgstr "" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) msgid "## If you plan to run exit relays" -msgstr "" +msgstr "## თუ გეგმავთ გამსვლელი გადამცემების გაშვებას" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) @@ -1536,7 +1541,7 @@ msgstr "" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) msgid "**Try to avoid** the following hosters:" -msgstr "" +msgstr "**შეეცადეთ აირიდოთ** შემდეგი მომწოდებლები:" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) @@ -1582,7 +1587,7 @@ msgstr "" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) msgid "# Choosing an Operating System" -msgstr "" +msgstr "# საოპერაციო სისტემის შერჩევა" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) @@ -1595,7 +1600,7 @@ msgstr "" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) msgid "Most relays currently run on Debian." -msgstr "" +msgstr "გადამცემების უმეტესობა გაშვებულია Debian-ზე." #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) @@ -1607,12 +1612,12 @@ msgstr "" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) msgid "* https://nusenu.github.io/OrNetStats/#os-distribution-relays" -msgstr "" +msgstr "* https://nusenu.github.io/OrNetStats/#os-distribution-relays" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) msgid "# OS Level Configuration" -msgstr "" +msgstr "# გამართვა საოპ. სისტემის დონეზე" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) @@ -1625,7 +1630,7 @@ msgstr "" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) msgid "## Time Synchronization (NTP)" -msgstr "" +msgstr "## დროის სინქრონიზაცია (NTP)" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) @@ -1638,12 +1643,12 @@ msgstr "" #: https//community.torproject.org/relay/getting-help/ #: (content/relay-operations/getting-help/contents+en.lrpage.title) msgid "Getting help" -msgstr "" +msgstr "მხარდაჭერის მიღება" #: https//community.torproject.org/relay/getting-help/ #: (content/relay-operations/getting-help/contents+en.lrpage.subtitle) msgid "How to get help if you run into issues" -msgstr "" +msgstr "როგორ უნდა მიიღოთ მხარდაჭერა, თუ ხარვეზებს წააწყდებით" #: https//community.torproject.org/relay/getting-help/ #: (content/relay-operations/getting-help/contents+en.lrpage.body) @@ -1665,7 +1670,7 @@ msgstr "" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.title) msgid "Risks" -msgstr "" +msgstr "საფრთხეები" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.subtitle) @@ -1776,7 +1781,7 @@ msgstr "" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) msgid "## Evaluating risks" -msgstr "" +msgstr "## საფრთხეების შეფასება" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) @@ -1803,7 +1808,7 @@ msgstr "" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) msgid "* Is it illegal for me to access certain websites?" -msgstr "" +msgstr "* კანონიერია ჩემთვის, გარკვეულ საიტებთან წვდომის უფლება?" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) @@ -1840,6 +1845,8 @@ msgid "" "For example, using Tor Browser may be viewed as illegal or anti-government " "activity." msgstr "" +"მაგალითად, Tor-ბრაუზერის გამოყენება შეიძლება განიხილებოდეს უკანონო ან " +"ანტისამთავრობო მოქმედებად." #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) @@ -1847,6 +1854,8 @@ msgid "" "Please note that we are not lawyers, and any information we give you does " "not constitute legal advice." msgstr "" +"გთხოვთ გაითვალისწინოთ, რომ ჩვენ არ ვართ სამართალმცოდნეები და ინფორმაცია " +"რასაც გაწვდით, არ შეიძლება მიიღოთ სამართლებრივი სახის რჩევებად." #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) @@ -2328,7 +2337,7 @@ msgstr "" #: https//community.torproject.org/training/faq/ #: (content/training/faq/contents+en.lrpage.title) msgid "Tor Training FAQ" -msgstr "" +msgstr "Tor-ის გადამზადების ხ.დ.კ." #: https//community.torproject.org/training/faq/ #: (content/training/faq/contents+en.lrpage.subtitle)

1 0