- tor-commits - lists.torproject.org

[tpo/master] Change open-iconic code to navbar-toggler-icon class
by gus＠torproject.org 30 Apr '20

30 Apr '20

commit 0405e7ebbd5d35a977bf9fac69840d0bfb907424 Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Sat Apr 11 21:13:17 2020 +0000 Change open-iconic code to navbar-toggler-icon class --- templates/sidenav.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/sidenav.html b/templates/sidenav.html index 8490aad2..48c8c60d 100644 --- a/templates/sidenav.html +++ b/templates/sidenav.html @@ -4,9 +4,8 @@ {{ _('Topics') }} </a> <label class="side-toggler" for="menu-toggle"> - <a class="btn btn-lg outline-primary text-primary navbar-toggler chevron" data-toggle="collapse" data-target="#navbarSupportedTopicsContent" aria-controls="navbarSupportedTopicsContent" aria-expanded="false" aria-label="Toggle navigation"> - <span class="oi oi-chevron-top chevron-up"></span> - <span class="oi oi-chevron-bottom chevron-down"></span> + <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"> + <span class="navbar-toggler-icon"></span> </a> </label> <input type="checkbox" id="menu-toggle"/>

1 0

[webwml/master] Fix #26 - Notify users that 2019.www is an outdated website
by gus＠torproject.org 30 Apr '20

30 Apr '20

commit 57b9f564bc03505e0189c2c22a9d2c7aa47c2ea1 Author: gus <gus(a)torproject.org> Date: Mon Apr 27 15:48:17 2020 -0400 Fix #26 - Notify users that 2019.www is an outdated website --- css/layout.css | 10 ++++++++-- css/layout.min.css | 8 ++++++-- docs/en/documentation.wml | 1 + en/notice.wmi | 15 +++++++++++++++ 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/css/layout.css b/css/layout.css index 16cd3ef7..6e214ffc 100644 --- a/css/layout.css +++ b/css/layout.css @@ -1398,7 +1398,7 @@ p.blogDate { .eoy-background { background-color: #F8F9FA; width: 100%; - height: 300px; + height: 250px; margin-bottom: 35px; } @@ -1417,7 +1417,7 @@ p.blogDate { } .eoy-message { - width: 55%; +/* width: 55%; */ float: right; padding-left: 35px; } @@ -1568,3 +1568,9 @@ input[type=checkbox]:checked ~ div#eoy-banner { .black { color: black; } + +/* 2019 notice */ + +.notice-2019 a, a:link, a:visited { + text-decoration: none; +} diff --git a/css/layout.min.css b/css/layout.min.css index 4a4d8f65..870cb1c1 100644 --- a/css/layout.min.css +++ b/css/layout.min.css @@ -3,7 +3,7 @@ .eoy-background { background-color: #F8F9FA; width: 100%; - height: 300px; + height: 250px; margin-bottom: 35px; } @@ -22,7 +22,7 @@ } .eoy-message { - width: 55%; +/* width: 55%; */ float: right; padding-left: 35px; } @@ -167,3 +167,7 @@ input[type=checkbox]:checked ~ div#eoy-banner { .black { color: black; } + +.notice-2019 a, a:link, a:visited { + text-decoration: none; +} diff --git a/docs/en/documentation.wml b/docs/en/documentation.wml index ee443d3f..d6642307 100644 --- a/docs/en/documentation.wml +++ b/docs/en/documentation.wml @@ -8,6 +8,7 @@ <a href="<page index>">Home » </a> <a href="<page docs/documentation>">Documentation</a> </div> +#include "notice.wmi" <div id="maincol"> <a id="RunningTor"></a> <a id="Support"></a> diff --git a/en/notice.wmi b/en/notice.wmi new file mode 100644 index 00000000..e5462367 --- /dev/null +++ b/en/notice.wmi @@ -0,0 +1,15 @@ +<label class="black" for="toggle-1">x</label> +<input type="checkbox" id="toggle-1"> +<div class="eoy-background"> + <div class="eoy-wrap"> + <div class="eoy-message"> + <div class="tor-strength-in-num"> + <p>This website is an online archive and it's outdated!</p> + </div> + <div class="keep-tor-strong-giv"> + <p class="advance-universal-hu">Some resources you will find here are <mark>outdated.</mark> We are currently working on a <a href="https://blog.torproject.org/meet-new-torprojectorg">new developer portal</a>.</p> + <p class="advance-universal-hu">You can find updated and maintained resources about <a href="https://tb-manual.torproject.org/">Tor Browser Manual</a>, <a href="https://support.torproject.org/">User Support</a>, <a href="https://community.torproject.org/relay">Relay Operations</a> and <a href="https://community.torproject.org/onion-services/">Onion Services</a>. If you have any questions or need help, please <a href="https://torproject.org/contact">contact us</a>.</p> + </div> + </div> + </div> +</div>

1 0

[tor/master] Merge branch 'pr1870_squashed'
by teor＠torproject.org 30 Apr '20

30 Apr '20

commit 6dc9930d3a14c30af0f285a884476f33a782938c Merge: efcae919a 7bf257b12 Author: teor <teor(a)torproject.org> Date: Thu Apr 30 22:22:09 2020 +1000 Merge branch 'pr1870_squashed' changes/ticket33956 | 5 +++++ src/core/or/channeltls.c | 10 +++------- src/lib/net/address.c | 3 +-- src/lib/net/address.h | 9 +++++++++ 4 files changed, 18 insertions(+), 9 deletions(-)

1 0

[tor/master] Define and use TOR_ADDRPORT_BUF_LEN
by teor＠torproject.org 30 Apr '20

30 Apr '20

commit 7bf257b1297d146047d10e0d527b45a88abf892a Author: Neel Chauhan <neel(a)neelc.org> Date: Sun Apr 26 13:06:11 2020 -0700 Define and use TOR_ADDRPORT_BUF_LEN --- changes/ticket33956 | 5 +++++ src/core/or/channeltls.c | 10 +++------- src/lib/net/address.c | 3 +-- src/lib/net/address.h | 9 +++++++++ 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/changes/ticket33956 b/changes/ticket33956 new file mode 100644 index 000000000..7ad802797 --- /dev/null +++ b/changes/ticket33956 @@ -0,0 +1,5 @@ + o Code simplification and refactoring: + - Define and use a new constant TOR_ADDRPORT_BUF_LEN which is like + TOR_ADDR_BUF_LEN but includes enough space for an IP address, + brackets, seperating colon, and port number. Closes ticket 33956. + Patch by Neel Chauhan. diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c index 5cedd9fbc..a39d32606 100644 --- a/src/core/or/channeltls.c +++ b/src/core/or/channeltls.c @@ -564,10 +564,7 @@ channel_tls_get_transport_name_method(channel_t *chan, char **transport_out) static const char * channel_tls_get_remote_descr_method(channel_t *chan, int flags) { - /* IPv6 address, colon, port */ -#define MAX_DESCR_LEN (TOR_ADDR_BUF_LEN + 1 + 5) - - static char buf[MAX_DESCR_LEN + 1]; + static char buf[TOR_ADDRPORT_BUF_LEN]; channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); connection_t *conn; const char *answer = NULL; @@ -580,15 +577,14 @@ channel_tls_get_remote_descr_method(channel_t *chan, int flags) switch (flags) { case 0: /* Canonical address with port*/ - tor_snprintf(buf, MAX_DESCR_LEN + 1, + tor_snprintf(buf, TOR_ADDRPORT_BUF_LEN, "%s:%u", conn->address, conn->port); answer = buf; break; case GRD_FLAG_ORIGINAL: /* Actual address with port */ addr_str = tor_addr_to_str_dup(&(tlschan->conn->real_addr)); - tor_snprintf(buf, MAX_DESCR_LEN + 1, - "%s:%u", addr_str, conn->port); + tor_snprintf(buf, TOR_ADDRPORT_BUF_LEN, "%s:%u", addr_str, conn->port); tor_free(addr_str); answer = buf; break; diff --git a/src/lib/net/address.c b/src/lib/net/address.c index 5dbef6a79..901dc187a 100644 --- a/src/lib/net/address.c +++ b/src/lib/net/address.c @@ -1173,8 +1173,7 @@ fmt_addr_impl(const tor_addr_t *addr, int decorate) const char * fmt_addrport(const tor_addr_t *addr, uint16_t port) { - /* Add space for a colon and up to 5 digits. */ - static char buf[TOR_ADDR_BUF_LEN + 6]; + static char buf[TOR_ADDRPORT_BUF_LEN]; tor_snprintf(buf, sizeof(buf), "%s:%u", fmt_and_decorate_addr(addr), port); return buf; } diff --git a/src/lib/net/address.h b/src/lib/net/address.h index 498449493..7b087ce12 100644 --- a/src/lib/net/address.h +++ b/src/lib/net/address.h @@ -209,6 +209,15 @@ tor_addr_eq_ipv4h(const tor_addr_t *a, uint32_t u) */ #define TOR_ADDR_BUF_LEN 48 +/** Length of a buffer containing an IP address along with a port number and + * a seperating colon. + * + * This allows enough space for + * "[ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255]:12345", + * plus a terminating NUL. + */ +#define TOR_ADDRPORT_BUF_LEN (TOR_ADDR_BUF_LEN + 6) + char *tor_addr_to_str_dup(const tor_addr_t *addr) ATTR_MALLOC; /** Wrapper function of fmt_addr_impl(). It does not decorate IPv6

1 0

[tor-browser-build/maint-9.0] Picking up 68.8.0esr rc2
by gk＠torproject.org 30 Apr '20

30 Apr '20

commit 545e9783a2faf9d577036ddc4f102c5a52dcb467 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 30 06:08:46 2020 +0000 Picking up 68.8.0esr rc2 --- projects/firefox-langpacks/config | 2 +- projects/firefox-locale-bundle/config | 2 +- projects/firefox/config | 2 +- rbm.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 34d6fad..17a707a 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index 2f4997f..2ea6db6 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 diff --git a/projects/firefox/config b/projects/firefox/config index 75efe0d..9d7c3c2 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index e23a15b..88a6565 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0.10' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.0.9 project_name: tor-browser

1 0

[tor/master] practracker: Accept the connection buf refactor
by teor＠torproject.org 30 Apr '20

30 Apr '20

commit efcae919aea4611d9f4ec5815170c48fc67134cf Author: teor <teor(a)torproject.org> Date: Thu Apr 30 13:55:26 2020 +1000 practracker: Accept the connection buf refactor Accept a few extra lines from the connection_buf_read_from_socket() refactor. Cleanup after 33131. --- scripts/maint/practracker/exceptions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index bf37d476f..8f718deff 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -68,7 +68,7 @@ problem function-size /src/core/mainloop/connection.c:connection_handle_listener problem function-size /src/core/mainloop/connection.c:connection_read_proxy_handshake() 153 problem function-size /src/core/mainloop/connection.c:retry_listener_ports() 112 problem function-size /src/core/mainloop/connection.c:connection_handle_read_impl() 111 -problem function-size /src/core/mainloop/connection.c:connection_buf_read_from_socket() 180 +problem function-size /src/core/mainloop/connection.c:connection_buf_read_from_socket() 186 problem function-size /src/core/mainloop/connection.c:connection_handle_write_impl() 241 problem function-size /src/core/mainloop/connection.c:assert_connection_ok() 143 problem dependency-violation /src/core/mainloop/connection.c 47

1 0

[tor/master] relay: Fix a comment typo in the selftest.c header
by teor＠torproject.org 30 Apr '20

30 Apr '20

commit 3eca667ae4ab7dfd4d6f87858808b2775ffb1340 Author: teor <teor(a)torproject.org> Date: Thu Apr 30 13:54:40 2020 +1000 relay: Fix a comment typo in the selftest.c header --- src/feature/relay/selftest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 8aaf068f9..402ce0e3d 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -8,7 +8,7 @@ * \file selftest.c * \brief Relay self-testing * - * Relays need to make sure that their own ports are reasonable, and estimate + * Relays need to make sure that their own ports are reachable, and estimate * their own bandwidth, before publishing. */

1 0

[translation/torbutton-torbuttonproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties_completed
by translation＠torproject.org 30 Apr '20

30 Apr '20

commit 811444e263378d4c2c802240f94b02ca49954e4f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 30 02:51:52 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- sv-SE/torbutton.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sv-SE/torbutton.properties b/sv-SE/torbutton.properties index fec775e55e..af27571723 100644 --- a/sv-SE/torbutton.properties +++ b/sv-SE/torbutton.properties @@ -20,9 +20,9 @@ torbutton.popup.external.title = Ladda ned en extern filtyp? torbutton.popup.external.app = Tor Browser kan inte visa filen. Du behöver öppna den i ett annat program.\n\n torbutton.popup.external.note = Vissa typer av filer kan få program att ansluta till internet utan att använda Tor.\n\n torbutton.popup.external.suggest = Det är säkrast att öppna filer du har hämtat hem bara när du är offline, eller så kan du använda en Tor Live CD som till exempel Tails.\n -torbutton.popup.launch = Hämta hem filen +torbutton.popup.launch = Hämta fil torbutton.popup.cancel = Avbryt -torbutton.popup.dontask = Hämta hem filer automatiskt i fortsättningen +torbutton.popup.dontask = Hämta filer automatiskt i fortsättningen torbutton.popup.no_newnym = Torbutton kan inte säkert ge dig en ny identitet. Det har inte tillgång till Tor Control Port.\n\nKör du Tor Browser Bundle? # torbutton.security_settings.menu.title = Security Settings torbutton.title.prompt_torbrowser = Viktig information om Torbutton

1 0

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 30 Apr '20

30 Apr '20

commit aba524eb27e69f7bacf851c40800ddcb7115cdce Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 30 02:51:46 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- sv-SE/torbutton.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sv-SE/torbutton.properties b/sv-SE/torbutton.properties index c33b4dc49d..78fff3a93e 100644 --- a/sv-SE/torbutton.properties +++ b/sv-SE/torbutton.properties @@ -20,9 +20,9 @@ torbutton.popup.external.title = Ladda ned en extern filtyp? torbutton.popup.external.app = Tor Browser kan inte visa filen. Du behöver öppna den i ett annat program.\n\n torbutton.popup.external.note = Vissa typer av filer kan få program att ansluta till internet utan att använda Tor.\n\n torbutton.popup.external.suggest = Det är säkrast att öppna filer du har hämtat hem bara när du är offline, eller så kan du använda en Tor Live CD som till exempel Tails.\n -torbutton.popup.launch = Hämta hem filen +torbutton.popup.launch = Hämta fil torbutton.popup.cancel = Avbryt -torbutton.popup.dontask = Hämta hem filer automatiskt i fortsättningen +torbutton.popup.dontask = Hämta filer automatiskt i fortsättningen torbutton.popup.no_newnym = Torbutton kan inte säkert ge dig en ny identitet. Det har inte tillgång till Tor Control Port.\n\nKör du Tor Browser Bundle? torbutton.security_settings.menu.title = Säkerhetsinställningar torbutton.title.prompt_torbrowser = Viktig information om Torbutton @@ -55,7 +55,7 @@ profileMigrationFailed=Migrering av din befintliga %S profil misslyckades.\nNya # "Downloading update" string for the hamburger menu (see #28885). # This string is kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -updateDownloadingPanelUILabel=Hämtar % s-uppdatering +updateDownloadingPanelUILabel=Hämtar %S-uppdatering # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Anslutning krypterad (Onion-tjänst, %1$S, %2$S bit nycklar, %3$S)

1 0

[tor/master] test/cell_formats: Expand the IPv6-only EXTEND2 test
by nickm＠torproject.org 29 Apr '20

29 Apr '20

commit f6c8a8c5387eaf35470f08e9cd9b35f05bdc1057 Author: teor <teor(a)torproject.org> Date: Tue Apr 14 18:44:06 2020 +1000 test/cell_formats: Expand the IPv6-only EXTEND2 test Part of 33901. --- src/test/test_cell_formats.c | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/src/test/test_cell_formats.c b/src/test/test_cell_formats.c index 3d3f151fc..f9ff101c9 100644 --- a/src/test/test_cell_formats.c +++ b/src/test/test_cell_formats.c @@ -769,6 +769,40 @@ test_cfmt_extend_cells(void *arg) tt_mem_op("brownshoesdontmakeit/brownshoesd", OP_EQ, ec.ed_pubkey.pubkey, 32); + /* Now try IPv6 without IPv4 */ + memset(p, 0, sizeof(p)); + memcpy(p, "\x02", 1); + memcpy(p+1, "\x02\x14" "anthropomorphization", 22); + memcpy(p+23, "\x01\x12" "xxxxxxxxxxxxxxxxYY", 20); + memcpy(p+43, "\xff\xff\x00\x20", 4); + tt_int_op(0, OP_EQ, extend_cell_parse(&ec, RELAY_COMMAND_EXTEND2, + p, sizeof(p))); + tt_int_op(RELAY_COMMAND_EXTEND2, OP_EQ, ec.cell_type); + tt_assert(fast_mem_is_zero((const char *)&ec.orport_ipv4.addr, + sizeof(tor_addr_t))); + tt_int_op(0, OP_EQ, ec.orport_ipv4.port); + tt_str_op("7878:7878:7878:7878:7878:7878:7878:7878", + OP_EQ, fmt_addr(&ec.orport_ipv6.addr)); + tt_int_op(22873, OP_EQ, ec.orport_ipv6.port); + tt_assert(ed25519_public_key_is_zero(&ec.ed_pubkey)); + tt_mem_op(ec.node_id,OP_EQ, "anthropomorphization", 20); + tt_int_op(cc->cell_type, OP_EQ, CELL_CREATE2); + tt_int_op(cc->handshake_type, OP_EQ, 0xffff); + tt_int_op(cc->handshake_len, OP_EQ, 32); + tt_int_op(0, OP_EQ, extend_cell_format(&p2_cmd, &p2_len, p2, &ec)); + tt_int_op(p2_cmd, OP_EQ, RELAY_COMMAND_EXTEND2); + tt_int_op(p2_len, OP_EQ, 47+32); + test_memeq_hex(p2, + /* Two items */ + "02" + /* The next is an RSA digest: anthropomorphization */ + "0214" "616e7468726f706f6d6f727068697a6174696f6e" + /*IPv6 address */ + "0112" "78787878787878787878787878787878" "5959" + /* Now the handshake prologue */ + "ffff0020"); + tt_int_op(0, OP_EQ, create_cell_format_relayed(&cell, cc)); + /* == Now try parsing some junk */ /* Try a too-long handshake */ @@ -824,13 +858,6 @@ test_cfmt_extend_cells(void *arg) memcpy(p+48, "\xff\xff\x00\x20", 4); tt_int_op(-1, OP_EQ, extend_cell_parse(&ec, RELAY_COMMAND_EXTEND2, p, sizeof(p))); - memset(p, 0, sizeof(p)); - memcpy(p, "\x02", 1); - memcpy(p+1, "\x02\x14" "anarchoindividualist", 22); - memcpy(p+23, "\x01\x12" "xxxxxxxxxxxxxxxxYY", 18); - memcpy(p+41, "\xff\xff\x00\x20", 4); - tt_int_op(0, OP_EQ, extend_cell_parse(&ec, RELAY_COMMAND_EXTEND2, - p, sizeof(p))); /* Running out of space in specifiers */ memset(p,0,sizeof(p));

1 0