- tor-commits - lists.torproject.org

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

19 May '20

commit 6f356d0f2b038e320b7caa83ab187952c361e52e Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 19 17:45:55 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- ar/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ar/https-everywhere.dtd b/ar/https-everywhere.dtd index 250db62fa4..c976cfd2fd 100644 --- a/ar/https-everywhere.dtd +++ b/ar/https-everywhere.dtd @@ -8,7 +8,7 @@ <!ENTITY https-everywhere.menu.donate_eff_imperative "تبرع لإي إف إف "> <!ENTITY https-everywhere.menu.observatory "خيارات مرصد SSL"> <!ENTITY https-everywhere.menu.globalDisable "HTTPS Everywhere لا يعمل"> -<!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere مُفعّل"> +<!ENTITY https-everywhere.menu.globalEnable "بروتوكول الـ HTTPS مفعل على جميع المواقع"> <!ENTITY https-everywhere.menu.encryptAllSitesEligibleOn "تشفير كافة المواقع المؤهلة للتشفير يعمل"> <!ENTITY https-everywhere.menu.encryptAllSitesEligibleOff "تشفير كافة المواقع المؤهلة للتشفير لا يعمل"> <!ENTITY https-everywhere.menu.httpNoWhereExplainedBlocked "الطلبات غير المشفرة محظورة حاليا">

1 0

[torspec/master] prop319: correct some typos about cell types.
by nickm＠torproject.org 19 May '20

19 May '20

commit 238a098e0b8bd08aab353429ef2059477bcc34fa Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 19 12:37:09 2020 -0400 prop319: correct some typos about cell types. --- proposals/319-wide-everything.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/proposals/319-wide-everything.md b/proposals/319-wide-everything.md index 29f65bb..0de6676 100644 --- a/proposals/319-wide-everything.md +++ b/proposals/319-wide-everything.md @@ -30,7 +30,7 @@ actually be _allowed_ for all relay cell types. # Proposal We add a new relay cell type: `RELAY_FRAGMENT`. This cell type contains part -of another relay cell. A `RELAY_FRAGEMENT` cell can either introduce a new +of another relay cell. A `RELAY_FRAGMENT` cell can either introduce a new fragmented cell, or can continue one that is already in progress. The format of a RELAY_FRAGMENT body is one of the following: @@ -62,16 +62,17 @@ non-full fragmented cell that is not the last fragment in a sequence. Fragmented cells MUST NOT be interleaved with other relay cells on a circuit, other than cells used for flow control. (Currently, this is only SENDME cells.) If any party receives any cell on a circuit, other than a flow -control cell or a RELAY_FRAGEMENT cell, before the fragmented cell is +control cell or a RELAY_FRAGMENT cell, before the fragmented cell is complete, than it SHOULD close the circuit. Parties MUST NOT send extra data in fragmented cells beyond the amount given in the first 'total_len' field. -Not every relay command may be sent in a fragmented cell. In this proposal, -we allow the following cell types to be fragmented: EXTEND2, EXTENDED2, -INTRODUCE1, INTRODUCE2, RENDEZVOUS. Any party receiving a command that they -believe should not be fragmented should close the circuit. +Not every relay command may be sent in a fragmented cell. In this +proposal, we allow the following cell types to be fragmented: EXTEND2, +EXTENDED2, INTRODUCE1, INTRODUCE2, RENDEZVOUS1, and RENDEZVOUS2. Any +party receiving a command that they believe should not be fragmented +should close the circuit. Not all lengths up to 65535 are valid lengths for a fragmented cell. Any length under 499 bytes SHOULD cause the circuit to close, since that could

1 0

[tpo/master] Update link - Can I distribute Tor to Support portal
by gus＠torproject.org 19 May '20

19 May '20

commit bd1fa46383030eea5f3b3b21a4cbc5dd7696af52 Author: gus <gus(a)torproject.org> Date: Mon May 18 23:31:29 2020 -0400 Update link - Can I distribute Tor to Support portal --- content/about/trademark/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/trademark/contents.lr b/content/about/trademark/contents.lr index 1dc524dc..0566a3d5 100644 --- a/content/about/trademark/contents.lr +++ b/content/about/trademark/contents.lr @@ -18,4 +18,4 @@ body: Content on this site is Copyright The Tor Project, Inc.. Reproduction of content is permitted under a [Creative Commons Attribution 3.0 United States License](https://creativecommons.org/licenses/by/3.0/us/). All use under such license must be accompanied by a clear and prominent attribution that identifies The Tor Project, Inc. as the owner and originator of such content. The Tor Project Inc. reserves the right to change licenses and permissions at any time in its sole discretion. -The Tor® software is licensed in various ways. Learn more about the [various licenses](https://2019.www.torproject.org/docs/faq.html.en#DistributingTor). +The Tor® software is licensed in various ways. Learn more about the [various licenses](https://support.torproject.org/about/distribute-tor/).

1 0

[tpo/master] Fix #74 - title in trademark page is tiny
by gus＠torproject.org 19 May '20

19 May '20

commit 91e87ee2bfabbe700a09a128fb2cd24505b69e37 Author: gus <gus(a)torproject.org> Date: Mon May 18 23:25:51 2020 -0400 Fix #74 - title in trademark page is tiny --- templates/macros/topic.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/macros/topic.html b/templates/macros/topic.html index 0439c829..7d9996d2 100644 --- a/templates/macros/topic.html +++ b/templates/macros/topic.html @@ -8,7 +8,7 @@ </h3> <div id="{{ t.control }}" role="tabpanel" data-parent="#topics" class="anchor-spacer"> <div id="{{ t.control }}Accordion" data-children=".question"> - <h5 class="text-muted mb-3 p-0 {{ bag('alternatives', alternative, 'direction') }}">{{ item.title }}</h5> + <h1 class="mb-3 p-0 {{ bag('alternatives', alternative, 'direction') }}">{{ item.title }}</h1> {% for q in site.query(item.path).include_undiscoverable(true) %} {{ render_question(q, item._id, alternative) }} {% endfor %}

1 0

[tor/master] doxygen: add a link to src-ref on mainpage.md.
by nickm＠torproject.org 19 May '20

19 May '20

commit 400bc46d838e830b058bd0f3596a88916d409e4c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 19 09:44:36 2020 -0400 doxygen: add a link to src-ref on mainpage.md. Closes 34246. --- src/mainpage.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mainpage.md b/src/mainpage.md index 8a7357881..2c4c49435 100644 --- a/src/mainpage.md +++ b/src/mainpage.md @@ -4,6 +4,9 @@ @section welcome Welcome to Tor +(For an up-to-date rendered copy of this documentation, see +https://src-ref.docs.torproject.org/tor/index.html .) + This documentation describes the general structure of the Tor codebase, how it fits together, what functionality is available for extending Tor, and gives some notes on how Tor got that way. It also includes a reference for

1 0

[tor/maint-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

[tor/maint-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/master] 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/master] 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

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

19 May '20

commit 9b55a62e732afe95238221378b22de1386c7adda Merge: 32e791be0 bdb3be011 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 19 09:39:12 2020 -0400 Merge branch '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