- tor-commits - lists.torproject.org

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by nickm＠torproject.org 19 May '20

19 May '20

commit 2d331e30c6a34f168ae6c6df498218d1cda5c902 Merge: 577655d6b bdb3be011 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 19 09:39:12 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket34255_043 | 3 +++ src/lib/conf/confdecl.h | 6 +++--- src/lib/container/smartlist.c | 2 +- src/lib/string/compat_ctype.c | 1 + src/lib/wallclock/time_to_tm.c | 1 + 5 files changed, 9 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.3] Merge branch 'ticket34255_043' into maint-0.4.3
by nickm＠torproject.org 19 May '20

19 May '20

commit bdb3be0119a6a61f4c6f4093a7f4d0d96e7f5b45 Merge: 6f2b6ede1 68fe8826d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 19 09:39:04 2020 -0400 Merge branch 'ticket34255_043' into maint-0.4.3 changes/ticket34255_043 | 3 +++ src/lib/conf/confdecl.h | 6 +++--- src/lib/container/smartlist.c | 2 +- src/lib/string/compat_ctype.c | 1 + src/lib/wallclock/time_to_tm.c | 1 + 5 files changed, 9 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.3] Doxygen: fix unbalanced groups.
by nickm＠torproject.org 19 May '20

19 May '20

commit 68fe8826ddec2eefa103e4772bce35f7d1666ac3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 19 09:18:39 2020 -0400 Doxygen: fix unbalanced groups. Closes ticket 34255. --- changes/ticket34255_043 | 3 +++ src/lib/conf/confdecl.h | 6 +++--- src/lib/container/smartlist.c | 2 +- src/lib/string/compat_ctype.c | 1 + src/lib/wallclock/time_to_tm.c | 1 + 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/changes/ticket34255_043 b/changes/ticket34255_043 new file mode 100644 index 000000000..5cfec1d48 --- /dev/null +++ b/changes/ticket34255_043 @@ -0,0 +1,3 @@ + o Documentation: + - Fix several doxygen warnings related to imbalanced groups. + Closes ticket 34255. diff --git a/src/lib/conf/confdecl.h b/src/lib/conf/confdecl.h index f7e79bb2b..c2d3fb335 100644 --- a/src/lib/conf/confdecl.h +++ b/src/lib/conf/confdecl.h @@ -136,11 +136,11 @@ }, /**@}*/ -/* @defgroup STUB_TABLE_MACROS Internal macros: stub table declarations, +/** @defgroup STUB_TABLE_MACROS Internal macros: stub table declarations, * for use when a module is disabled. * Implementation helpers: the regular confdecl macros expand to these * when CONF_CONTEXT is defined to LL_TABLE. Don't use them directly. - * @{*/ + * @{ */ #define BEGIN_CONF_STRUCT__STUB_TABLE(structname) \ static const config_var_t structname##_vars[] = { #define END_CONF_STRUCT__STUB_TABLE(structname) \ @@ -166,7 +166,7 @@ * when the macro sees us declare a configuration option "foo" of type STRING, * it can emit `config_decl_STRING foo;`, which is an alias for `char *foo`. */ -/**{*/ +/**@{*/ typedef char *config_decl_STRING; typedef char *config_decl_FILENAME; /* Yes, "POSINT" is really an int, and not an unsigned int. For diff --git a/src/lib/container/smartlist.c b/src/lib/container/smartlist.c index eeb3bce95..7784f8395 100644 --- a/src/lib/container/smartlist.c +++ b/src/lib/container/smartlist.c @@ -652,7 +652,7 @@ smartlist_sort_pointers(smartlist_t *sl) #define LEFT_CHILD(i) ( 2*(i) + 1 ) #define RIGHT_CHILD(i) ( 2*(i) + 2 ) #define PARENT(i) ( ((i)-1) / 2 ) -/** }@ */ +/** @} */ /** @{ */ /** Helper macros for heaps: Given a local variable <b>idx_field_offset</b> diff --git a/src/lib/string/compat_ctype.c b/src/lib/string/compat_ctype.c index 235760502..a7668bfbf 100644 --- a/src/lib/string/compat_ctype.c +++ b/src/lib/string/compat_ctype.c @@ -29,6 +29,7 @@ const uint32_t TOR_ISPRINT_TABLE[8] = { 0, 0xffffffff, 0xffffffff, 0x7fffffff, 0, 0, 0, 0x0 }; const uint32_t TOR_ISUPPER_TABLE[8] = { 0, 0, 0x7fffffe, 0, 0, 0, 0, 0 }; const uint32_t TOR_ISLOWER_TABLE[8] = { 0, 0, 0, 0x7fffffe, 0, 0, 0, 0 }; +/**@}*/ /** Upper-casing and lowercasing tables to map characters to upper/lowercase * equivalents. Used by tor_toupper() and tor_tolower(). */ diff --git a/src/lib/wallclock/time_to_tm.c b/src/lib/wallclock/time_to_tm.c index dcd3c59c5..8c747b4c7 100644 --- a/src/lib/wallclock/time_to_tm.c +++ b/src/lib/wallclock/time_to_tm.c @@ -198,3 +198,4 @@ tor_gmtime_r_msg(const time_t *timep, struct tm *result, char **err_out) return correct_tm(0, timep, result, r, err_out); } #endif /* defined(HAVE_GMTIME_R) || ... */ +/**@}*/

1 0

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 19 May '20

19 May '20

commit f1bba52197e0eb76b9f1a672bcbd51945bd8ec7f Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 19 12:15:25 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- mk/LC_MESSAGES/bridgedb.po | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/mk/LC_MESSAGES/bridgedb.po b/mk/LC_MESSAGES/bridgedb.po index 82e09cd602..7813e69628 100644 --- a/mk/LC_MESSAGES/bridgedb.po +++ b/mk/LC_MESSAGES/bridgedb.po @@ -11,14 +11,14 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2020-04-09 14:45-0700\n" -"PO-Revision-Date: 2020-04-15 19:46+0000\n" -"Last-Translator: Transifex Bot <>\n" +"POT-Creation-Date: 2020-05-14 14:21-0700\n" +"PO-Revision-Date: 2020-05-19 11:54+0000\n" +"Last-Translator: Zarko Gjurov <zarkogjurov(a)gmail.com>\n" "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.7.0\n" +"Generated-By: Babel 2.8.0\n" "Language: mk\n" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" @@ -82,31 +82,26 @@ msgstr "Покажи QR код" msgid "QRCode for your bridge lines" msgstr "QR код за вашите мост конекции" -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: bridgedb/distributors/https/templates/bridges.html:67 -#: bridgedb/distributors/https/templates/bridges.html:119 -msgid "Uh oh, spaghettios!" -msgstr "Леле мајко!" - -#: bridgedb/distributors/https/templates/bridges.html:68 +#: bridgedb/distributors/https/templates/bridges.html:63 msgid "It seems there was an error getting your QRCode." msgstr "Има грешка во добивањето на вашиот QR код." -#: bridgedb/distributors/https/templates/bridges.html:73 +#: bridgedb/distributors/https/templates/bridges.html:68 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." msgstr "Овој QR код ги содржи вашите мост конекции. Скенирај го со QR код читач т.е. со камерата за да ги копирате мост конекции на вашиот мобилен телефон или друг уред." -#: bridgedb/distributors/https/templates/bridges.html:125 +#: bridgedb/distributors/https/templates/bridges.html:110 +msgid "BridgeDB encountered an error." +msgstr "BridgeDB наиде на грешка." + +#: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..." msgstr "Моментално нема достапни мостови..." -#: bridgedb/distributors/https/templates/bridges.html:127 -#: bridgedb/distributors/https/templates/bridges.html:131 +#: bridgedb/distributors/https/templates/bridges.html:118 +#: bridgedb/distributors/https/templates/bridges.html:122 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge "

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 19 May '20

19 May '20

commit de9fa4f6310fef43302c81b031bda3f29f2c4a6d Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 19 12:15:19 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- mk/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mk/LC_MESSAGES/bridgedb.po b/mk/LC_MESSAGES/bridgedb.po index 8be26e46f3..7813e69628 100644 --- a/mk/LC_MESSAGES/bridgedb.po +++ b/mk/LC_MESSAGES/bridgedb.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-15 08:24+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-05-19 11:54+0000\n" +"Last-Translator: Zarko Gjurov <zarkogjurov(a)gmail.com>\n" "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -94,7 +94,7 @@ msgstr "Овој QR код ги содржи вашите мост конекц #: bridgedb/distributors/https/templates/bridges.html:110 msgid "BridgeDB encountered an error." -msgstr "" +msgstr "BridgeDB наиде на грешка." #: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..."

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 19 May '20

19 May '20

commit 717cb1df3fe535e643b27b5485b15dd2136d5ba2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 19 08:15:30 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/ps/LC_MESSAGES/messages.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/locale/ps/LC_MESSAGES/messages.po b/locale/ps/LC_MESSAGES/messages.po index b9904ce8f9..bdd62b258e 100644 --- a/locale/ps/LC_MESSAGES/messages.po +++ b/locale/ps/LC_MESSAGES/messages.po @@ -1,9 +1,11 @@ +# # Translators: # erinm, 2018 +# Leo, 2020 # msgid "" msgstr "" -"Last-Translator: erinm, 2018\n" +"Last-Translator: Leo, 2020\n" "Language-Team: Pushto (https://www.transifex.com/otf/teams/1519/ps/)\n" "Language: ps\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -356,7 +358,7 @@ msgstr "" #: tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:64 #: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:46 msgid "Email" -msgstr "" +msgstr "برېښلیک" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:192 #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:320

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 19 May '20

19 May '20

commit 6021e8090ba91b0ae6148512b6993ef3dfc64beb Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 19 05:45:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- sv/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po index 0bae5ef7ec..d401de5cda 100644 --- a/sv/LC_MESSAGES/bridgedb.po +++ b/sv/LC_MESSAGES/bridgedb.po @@ -20,8 +20,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-15 08:24+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-05-19 05:32+0000\n" +"Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl(a)gmail.com>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -102,7 +102,7 @@ msgstr "Denna QR-kod innehåller dina rader med broar. Skanna den med en QR-kodl #: bridgedb/distributors/https/templates/bridges.html:110 msgid "BridgeDB encountered an error." -msgstr "" +msgstr "BridgeDB stötte på ett fel." #: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..."

1 0

[community/master] Remove Tor tshirt image reference for now
by gus＠torproject.org 19 May '20

19 May '20

commit ab8da40eb1101ea8ef6820da0ca9d8725c35c0d8 Author: Gustavo Gus <gusgustavo(a)users.noreply.github.com> Date: Mon May 18 22:04:28 2020 +0000 Remove Tor tshirt image reference for now --- .../relay-operations/community-resources/swag/contents.lr | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/content/relay-operations/community-resources/swag/contents.lr b/content/relay-operations/community-resources/swag/contents.lr index 53fa7bb..b27f990 100644 --- a/content/relay-operations/community-resources/swag/contents.lr +++ b/content/relay-operations/community-resources/swag/contents.lr @@ -6,13 +6,17 @@ title: Swag --- body: -You can get one of these fine Tor T-shirts for contributing to the Tor project. There are two primary ways of contributing: +You can get a Tor T-shirt for contributing to the Tor project. +There are two primary ways of contributing: -* Operate a fast Tor relay that's been running for the past two months: you are eligible if you allow exits to port 80 and you average 250 KBytes/s traffic, or if you're not an exit but you average 500 KBytes/s traffic. +* Operate a fast Tor relay that's been running for the past two months: you are eligible if you allow exits to port 80 and you average 250 KBytes/s traffic, or if you're not an exit but you average 500 KBytes/s traffic. -* Help out in other ways. Maintain a translation. Run Tor trainings. Write a good support program and get a lot of people to use it. Do research on Tor and anonymity, solve some of our bugs, or establish yourself as a Tor advocate. +* Help out in other ways. Maintain a translation. Run Tor trainings. +Write a good support program and get a lot of people to use it. +Do research on Tor and anonymity, solve some of our bugs, or establish yourself as a Tor advocate. -If you're operating a fast relay or you've done something else cool, email us at tshirt at torproject.org with the details. (We want to make sure our shirts help outreach happen all around the world, so please understand if we can't send you 5 shirts for your 5 excellent relays.) +If you're operating a fast relay or you've done something else cool, email us at tshirt at torproject.org with the details. +(We want to make sure our shirts help outreach happen all around the world, so please understand if we can't send you 5 shirts for your 5 excellent relays.) There are a variety of colors, shapes, and sizes available in the great roots design that Leiah Jansen made for us, as well as some older designs. --- @@ -24,4 +28,4 @@ section: Community Resources --- section_id: community-resources --- -subtitle: If you're operating a fast relay or you've done something else cool, you're eligible to receive our swag +subtitle: If you're operating a fast relay or you've done something else cool, you're eligible to receive our swag.

1 0

[community/master] Merge branch 'chevron-icon-fix'
by gus＠torproject.org 19 May '20

19 May '20

commit 90fdb95aeeb5fe006ff5c2562b11ed09e08297e6 Merge: fed3585 fc3910e Author: gus <gus(a)torproject.org> Date: Mon May 18 17:51:10 2020 -0400 Merge branch 'chevron-icon-fix' templates/sidenav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[community/master] Fix chevron icon
by gus＠torproject.org 19 May '20

19 May '20

commit fc3910e60270243c848b60cb0c38e602273dd761 Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Mon May 18 21:28:30 2020 +0000 Fix chevron icon --- templates/sidenav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/sidenav.html b/templates/sidenav.html index 5175771..5ac15c8 100644 --- a/templates/sidenav.html +++ b/templates/sidenav.html @@ -1,7 +1,7 @@ <div class="container-fluid sidebar col-xs-12 col-sm-12 col-md-3 col-lg-3"> <nav class="smalltopics no-background navbar navbar-expand-lg navbar-light bg-white p-0 fixed"> <label class="side-toggler" for="menu-toggle"> - <a class="btn btn-lg outline-primary text-primary navbar-toggler" data-toggle="collapse" data-target="#navbarSupportedTopicsContent" aria-controls="navbarSupportedTopicsContent" aria-expanded="false" aria-label="Toggle navigation"> + <a class="btn btn-lg outline-primary text-primary navbar-toggler collapsed" data-toggle="collapse" data-target="#navbarSupportedTopicsContent" aria-controls="navbarSupportedTopicsContent" aria-expanded="false" aria-label="Toggle navigation"> <i class="fas"></i> </a> </label>

1 0