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

[torspec/master] Merge remote-tracking branch 'tor-github/pr/44'
by nickm＠torproject.org 14 Jan '19

14 Jan '19

commit 81aeca7501f89e9889d592ef2217b265c41bf2df Merge: 139b5d0 c2cc4de Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 14 14:07:11 2019 -0500 Merge remote-tracking branch 'tor-github/pr/44' dir-spec.txt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)

1 0

[torspec/master] dir-spec: Make extra-info-digest reflect reality
by nickm＠torproject.org 14 Jan '19

14 Jan '19

commit c2cc4dea16a3b90816e08380da0c7a8de54903e4 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Mon Nov 12 21:31:23 2018 +0000 dir-spec: Make extra-info-digest reflect reality The extra-info-digest field of server descriptors was defined to contain either a SHA1, or a SHA1 and a SHA256 digest. These were both meant to be computed over the same data but due to an implementation error, the Tor network has been computing the digests over different data for a while. This is a lot easier to fix in the spec than in the code, and the error does not seem to cause any harm beyond being a little confusing (which this patch should help with). A minor fix is also made to the SHA1 digest portion of the text. This is a typo fix and a clarification, and does not change the semantic meaning for that portion. --- dir-spec.txt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 8da28c4..f96fd64 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -701,17 +701,23 @@ [Versions before 0.2.0.1-alpha don't recognize this] - "extra-info-digest" SP sha1digest [SP sha256-digest] NL + "extra-info-digest" SP sha1-digest [SP sha256-digest] NL [At most once] - "sha1-digest" is a hex-encoded digest (using upper-case characters) of - the router's extra-info document, as signed in the router's extra-info - (that is, not including the signature). (If this field is absent, the - router is not uploading a corresponding extra-info document.) + "sha1-digest" is a hex-encoded SHA1 digest (using upper-case characters) + of the router's extra-info document, as signed in the router's + extra-info (that is, not including the signature). (If this field is + absent, the router is not uploading a corresponding extra-info + document.) "sha256-digest" is a base64-encoded SHA256 digest of the extra-info - document, computed over the same data. + document. Unlike the "sha1-digest", this digest is calculated over the + entire document, including the signature. This difference is due to + a long-lived bug in the tor implementation that it would be difficult + to roll out an incremental fix for, not a design choice. Future digest + algorithms specified should not include the signature in the data used + to compute the digest. [Versions before 0.2.7.2-alpha did not include a SHA256 digest.] [Versions before 0.2.0.1-alpha don't recognize this field at all.]

1 0

[tor/maint-0.3.5] Rework rep_hist_log_link_protocol_counts()
by nickm＠torproject.org 14 Jan '19

14 Jan '19

commit 9d9e71824cc228123aebd28b7b08fb9fb30d36b1 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Dec 23 20:55:14 2018 +0200 Rework rep_hist_log_link_protocol_counts() --- changes/bug28920 | 6 ++++++ src/feature/stats/rephist.c | 35 +++++++++++++++++------------------ 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/changes/bug28920 b/changes/bug28920 new file mode 100644 index 000000000..e698686a6 --- /dev/null +++ b/changes/bug28920 @@ -0,0 +1,6 @@ + o Minor bugfixes (logging): + - Rework rep_hist_log_link_protocol_counts() to iterate through all link + protocol versions when logging incoming/outgoing connection counts. Tor + no longer skips version 5 and we don't have to remember to update this + function when new link protocol version is developed. Fixes bug 28920; + bugfix on 0.2.6.10. diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c index 37c4759f3..3967a548b 100644 --- a/src/feature/stats/rephist.c +++ b/src/feature/stats/rephist.c @@ -2874,24 +2874,23 @@ rep_hist_get_padding_count_lines(void) void rep_hist_log_link_protocol_counts(void) { - log_notice(LD_HEARTBEAT, - "Since startup, we have initiated " - "%"PRIu64" v1 connections, " - "%"PRIu64" v2 connections, " - "%"PRIu64" v3 connections, and " - "%"PRIu64" v4 connections; and received " - "%"PRIu64" v1 connections, " - "%"PRIu64" v2 connections, " - "%"PRIu64" v3 connections, and " - "%"PRIu64" v4 connections.", - (link_proto_count[1][1]), - (link_proto_count[2][1]), - (link_proto_count[3][1]), - (link_proto_count[4][1]), - (link_proto_count[1][0]), - (link_proto_count[2][0]), - (link_proto_count[3][0]), - (link_proto_count[4][0])); + smartlist_t *lines = smartlist_new(); + + for (int i = 1; i <= MAX_LINK_PROTO; i++) { + char *line = NULL; + tor_asprintf(&line, "initiated %"PRIu64" and received " + "%"PRIu64" v%d connections", link_proto_count[i][1], + link_proto_count[i][0], i); + smartlist_add(lines, line); + } + + char *log_line = smartlist_join_strings(lines, "; ", 0, NULL); + + log_notice(LD_HEARTBEAT, "Since startup we %s.", log_line); + + SMARTLIST_FOREACH(lines, char *, s, tor_free(s)); + smartlist_free(lines); + tor_free(log_line); } /** Free all storage held by the OR/link history caches, by the

1 0

[tor/master] Rework rep_hist_log_link_protocol_counts()
by nickm＠torproject.org 14 Jan '19

14 Jan '19

commit 9d9e71824cc228123aebd28b7b08fb9fb30d36b1 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Dec 23 20:55:14 2018 +0200 Rework rep_hist_log_link_protocol_counts() --- changes/bug28920 | 6 ++++++ src/feature/stats/rephist.c | 35 +++++++++++++++++------------------ 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/changes/bug28920 b/changes/bug28920 new file mode 100644 index 000000000..e698686a6 --- /dev/null +++ b/changes/bug28920 @@ -0,0 +1,6 @@ + o Minor bugfixes (logging): + - Rework rep_hist_log_link_protocol_counts() to iterate through all link + protocol versions when logging incoming/outgoing connection counts. Tor + no longer skips version 5 and we don't have to remember to update this + function when new link protocol version is developed. Fixes bug 28920; + bugfix on 0.2.6.10. diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c index 37c4759f3..3967a548b 100644 --- a/src/feature/stats/rephist.c +++ b/src/feature/stats/rephist.c @@ -2874,24 +2874,23 @@ rep_hist_get_padding_count_lines(void) void rep_hist_log_link_protocol_counts(void) { - log_notice(LD_HEARTBEAT, - "Since startup, we have initiated " - "%"PRIu64" v1 connections, " - "%"PRIu64" v2 connections, " - "%"PRIu64" v3 connections, and " - "%"PRIu64" v4 connections; and received " - "%"PRIu64" v1 connections, " - "%"PRIu64" v2 connections, " - "%"PRIu64" v3 connections, and " - "%"PRIu64" v4 connections.", - (link_proto_count[1][1]), - (link_proto_count[2][1]), - (link_proto_count[3][1]), - (link_proto_count[4][1]), - (link_proto_count[1][0]), - (link_proto_count[2][0]), - (link_proto_count[3][0]), - (link_proto_count[4][0])); + smartlist_t *lines = smartlist_new(); + + for (int i = 1; i <= MAX_LINK_PROTO; i++) { + char *line = NULL; + tor_asprintf(&line, "initiated %"PRIu64" and received " + "%"PRIu64" v%d connections", link_proto_count[i][1], + link_proto_count[i][0], i); + smartlist_add(lines, line); + } + + char *log_line = smartlist_join_strings(lines, "; ", 0, NULL); + + log_notice(LD_HEARTBEAT, "Since startup we %s.", log_line); + + SMARTLIST_FOREACH(lines, char *, s, tor_free(s)); + smartlist_free(lines); + tor_free(log_line); } /** Free all storage held by the OR/link history caches, by the

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 14 Jan '19

14 Jan '19

commit ade9204fc18058f0ce35e1533d474baeaf17862e Merge: 0917f621e 9d9e71824 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 14 14:02:42 2019 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug28920 | 6 ++++++ src/feature/stats/rephist.c | 35 +++++++++++++++++------------------ 2 files changed, 23 insertions(+), 18 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 14 Jan '19

14 Jan '19

commit 691dec5d4615dec9a845d0f7dea7ef55cc66fe62 Merge: 99947c3ce 9d9e71824 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 14 14:02:42 2019 -0500 Merge branch 'maint-0.3.5' changes/bug28920 | 6 ++++++ src/feature/stats/rephist.c | 35 +++++++++++++++++------------------ 2 files changed, 23 insertions(+), 18 deletions(-)

1 0

[tor/release-0.3.5] Rework rep_hist_log_link_protocol_counts()
by nickm＠torproject.org 14 Jan '19

14 Jan '19

commit 9d9e71824cc228123aebd28b7b08fb9fb30d36b1 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Dec 23 20:55:14 2018 +0200 Rework rep_hist_log_link_protocol_counts() --- changes/bug28920 | 6 ++++++ src/feature/stats/rephist.c | 35 +++++++++++++++++------------------ 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/changes/bug28920 b/changes/bug28920 new file mode 100644 index 000000000..e698686a6 --- /dev/null +++ b/changes/bug28920 @@ -0,0 +1,6 @@ + o Minor bugfixes (logging): + - Rework rep_hist_log_link_protocol_counts() to iterate through all link + protocol versions when logging incoming/outgoing connection counts. Tor + no longer skips version 5 and we don't have to remember to update this + function when new link protocol version is developed. Fixes bug 28920; + bugfix on 0.2.6.10. diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c index 37c4759f3..3967a548b 100644 --- a/src/feature/stats/rephist.c +++ b/src/feature/stats/rephist.c @@ -2874,24 +2874,23 @@ rep_hist_get_padding_count_lines(void) void rep_hist_log_link_protocol_counts(void) { - log_notice(LD_HEARTBEAT, - "Since startup, we have initiated " - "%"PRIu64" v1 connections, " - "%"PRIu64" v2 connections, " - "%"PRIu64" v3 connections, and " - "%"PRIu64" v4 connections; and received " - "%"PRIu64" v1 connections, " - "%"PRIu64" v2 connections, " - "%"PRIu64" v3 connections, and " - "%"PRIu64" v4 connections.", - (link_proto_count[1][1]), - (link_proto_count[2][1]), - (link_proto_count[3][1]), - (link_proto_count[4][1]), - (link_proto_count[1][0]), - (link_proto_count[2][0]), - (link_proto_count[3][0]), - (link_proto_count[4][0])); + smartlist_t *lines = smartlist_new(); + + for (int i = 1; i <= MAX_LINK_PROTO; i++) { + char *line = NULL; + tor_asprintf(&line, "initiated %"PRIu64" and received " + "%"PRIu64" v%d connections", link_proto_count[i][1], + link_proto_count[i][0], i); + smartlist_add(lines, line); + } + + char *log_line = smartlist_join_strings(lines, "; ", 0, NULL); + + log_notice(LD_HEARTBEAT, "Since startup we %s.", log_line); + + SMARTLIST_FOREACH(lines, char *, s, tor_free(s)); + smartlist_free(lines); + tor_free(log_line); } /** Free all storage held by the OR/link history caches, by the

1 0

[tor/master] lib/net: improve the docs for tor_{ersatz_, }socketpair()
by nickm＠torproject.org 14 Jan '19

14 Jan '19

commit 671c34d9b496ecdde67527cc10b657ff6bd35c9e Author: teor <teor(a)torproject.org> Date: Tue Jan 8 14:45:17 2019 +1000 lib/net: improve the docs for tor_{ersatz_,}socketpair() Add some details about IP family support, and point to tor_socketpair() from tor_ersatz_socketpair(). Closes ticket 29015. --- src/lib/net/socket.c | 4 +++- src/lib/net/socketpair.c | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/lib/net/socket.c b/src/lib/net/socket.c index 8940e0059..385c987e6 100644 --- a/src/lib/net/socket.c +++ b/src/lib/net/socket.c @@ -458,7 +458,9 @@ get_n_open_sockets(void) * localhost is inaccessible (for example, if the networking * stack is down). And even if it succeeds, the socket pair will not * be able to read while localhost is down later (the socket pair may - * even close, depending on OS-specific timeouts). + * even close, depending on OS-specific timeouts). The socket pair + * should work on IPv4-only, IPv6-only, and dual-stack systems, as long + * as they have the standard localhost addresses. * * Returns 0 on success and -errno on failure; do not rely on the value * of errno or WSAGetLastError(). diff --git a/src/lib/net/socketpair.c b/src/lib/net/socketpair.c index 380338f15..b23f08cab 100644 --- a/src/lib/net/socketpair.c +++ b/src/lib/net/socketpair.c @@ -105,7 +105,12 @@ sockaddr_eq(struct sockaddr *sa1, struct sockaddr *sa2) /** * Helper used to implement socketpair on systems that lack it, by * making a direct connection to localhost. - */ + * + * See tor_socketpair() for details. + * + * The direct connection defaults to IPv4, but falls back to IPv6 if + * IPv4 is not supported. + **/ int tor_ersatz_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) {

1 0

[tor/master] Merge remote-tracking branch 'teor/bug29015'
by nickm＠torproject.org 14 Jan '19

14 Jan '19

commit 99947c3ce0a34f8a2dd8c201f8ef348666da403a Merge: cef910642 671c34d9b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 14 13:59:07 2019 -0500 Merge remote-tracking branch 'teor/bug29015' src/lib/net/socket.c | 4 +++- src/lib/net/socketpair.c | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-)

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 14 Jan '19

14 Jan '19

commit fc4c2897e3ff2da1e3781c82c14e64969e37d659 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 14 18:49:18 2019 +0000 Update translations for tor-launcher-network-settings --- ro/network-settings.dtd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ro/network-settings.dtd b/ro/network-settings.dtd index 628b5fa54..125e77d75 100644 --- a/ro/network-settings.dtd +++ b/ro/network-settings.dtd @@ -1,17 +1,17 @@ -<!ENTITY torsettings.dialog.title "Setări rețea Tor"> +<!ENTITY torsettings.dialog.title "Setări Rețea Tor"> <!ENTITY torsettings.wizard.title.default "Conectare la Tor"> <!ENTITY torsettings.wizard.title.configure "Setări Rețea Tor"> <!ENTITY torsettings.wizard.title.connecting "Stabilire Conexiune">  <!ENTITY torlauncher.localePicker.title "Limba pentru Tor Browser"> -<!ENTITY torlauncher.localePicker.prompt "Va rugăm sa alegeți o limba."> +<!ENTITY torlauncher.localePicker.prompt "Va rugăm sa alegeți o limbă.">  -<!ENTITY torSettings.connectPrompt "Apasă "Conectare" pentru a te conecta la Tor"> +<!ENTITY torSettings.connectPrompt "Apasă "Conectare" pentru a te conecta la Tor."> <!ENTITY torSettings.configurePrompt "Apasă "Configurare" pentru a modifica setările de rețea dacă te afli într-o țară care blochează Tor (cum ar fi Egipt, China, Turcia) sau dacă te conectezi dintr-o rețea privată care necesită un proxy."> -<!ENTITY torSettings.configure "Configuraţi "> +<!ENTITY torSettings.configure "Configurare"> <!ENTITY torSettings.connect "Conectare">  @@ -20,8 +20,8 @@ <!ENTITY torsettings.restartTor "Repornește Tor"> <!ENTITY torsettings.reconfigTor "Reconfigurare"> -<!ENTITY torsettings.discardSettings.prompt "Ați configurat bridge-uri Tor sau ați introdus setări proxu locale.  Pentru a face o conexiune directă la rețeaua Tor aceste setări trebuiesc eliminate."> -<!ENTITY torsettings.discardSettings.proceed "Eliminați Setări și Conectare"> +<!ENTITY torsettings.discardSettings.prompt "Ați configurat punți Tor sau ați introdus setări proxy locale.  Pentru a te conecta direct la rețeaua Tor aceste setări trebuiesc eliminate."> +<!ENTITY torsettings.discardSettings.proceed "Eliminare Setări și Conectare"> <!ENTITY torsettings.optional "Opțional"> @@ -44,7 +44,7 @@ <!ENTITY torsettings.useBridges.bridgeDB "Cere o punte de la torproject.org"> <!ENTITY torsettings.useBridges.captchaSolution.placeholder "Introdu caracterele din imagine"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "A depune"> +<!ENTITY torsettings.useBridges.captchaSubmit "Trimite"> <!ENTITY torsettings.useBridges.custom "Furnizează o punte pe care o știu"> <!ENTITY torsettings.useBridges.label "Introdu informația despre punte dintr-o sursă de încredere"> <!ENTITY torsettings.useBridges.placeholder "scrie adresă:port (una pe linie)">

1 0