August 2018 - tor-commits - lists.torproject.org

[torspec/master] Merge remote-tracking branch 'rl1987/doc26903'
by nickm＠torproject.org 03 Aug '18

03 Aug '18

commit 78f32c6f6f1ae0b0f64a628e62ce64877a596c74 Merge: 684c46b 4f6a391 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 3 07:07:10 2018 -0400 Merge remote-tracking branch 'rl1987/doc26903' control-spec.txt | 51 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 9 deletions(-)

1 0

[torspec/master] Document all of GETINFO net/listeners/*
by nickm＠torproject.org 03 Aug '18

03 Aug '18

commit 4f6a3915bec6d0b241abf623461814bcc68ca6ff Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Jul 24 13:50:58 2018 +0300 Document all of GETINFO net/listeners/* --- control-spec.txt | 51 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index cc75cbc..e7a5b79 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -864,15 +864,8 @@ this is *not* the latest descriptors we've published, but rather what we would generate if we needed to make a new descriptor right now. - "net/listeners/or" - "net/listeners/dir" - "net/listeners/socks" - "net/listeners/trans" - "net/listeners/natd" - "net/listeners/dns" - "net/listeners/control" - "net/listeners/extor" - "net/listeners/httptunnel" + "net/listeners/*" + A quoted, space-separated list of the locations where Tor is listening for connections of the specified type. These can contain IPv4 network address... @@ -889,6 +882,46 @@ [New in Tor 0.2.2.26-beta.] + "net/listeners/or" + + Listeners for OR connections. Talks Tor protocol as described in + tor-spec.txt. + + "net/listeners/dir" + + Listeners for Tor directory protocol, as decribed in dir-spec.txt. + + "net/listeners/socks" + + Listeners for onion proxy connections that talk SOCKS4/4a/5 protocol. + + "net/listeners/trans" + + Listeners for transparent connections redirected by firewall, such as + pf or netfilter. + + "net/listeners/natd" + + Listeners for transparent connections redirected by natd. + + "net/listeners/dns" + + Listeners for a subset of DNS protocol that Tor network supports. + + "net/listeners/control" + + Listeners for Tor control protocol, described herein. + + "net/listeners/extor" + + Listeners corresponding to Extended ORPorts for integration with + pluggable transports. See proposals 180 and 196. + + "net/listeners/httptunnel" + + Listeners for onion proxy connections that leverage HTTP CONNECT + tunnelling. + [The extor and httptunnel lists were added in 0.3.2.12, 0.3.3.10, and 0.3.4.6-rc.]

1 0

[tor/master] Increase line coverage in libtor-string to 100%
by nickm＠torproject.org 03 Aug '18

03 Aug '18

commit ee12c11dd4e81d44020ded9f275ec030de0a2d1f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 17 16:47:32 2018 -0400 Increase line coverage in libtor-string to 100% (On linux.) --- src/lib/string/printf.c | 2 +- src/test/test_util.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/lib/string/printf.c b/src/lib/string/printf.c index 82d38242d..e23da69d0 100644 --- a/src/lib/string/printf.c +++ b/src/lib/string/printf.c @@ -101,7 +101,7 @@ tor_vasprintf(char **strp, const char *fmt, va_list args) /* If the platform gives us one, use it. */ int r = vasprintf(&strp_tmp, fmt, args); if (r < 0) - *strp = NULL; + *strp = NULL; // LCOV_EXCL_LINE -- no cross-platform way to force this else *strp = strp_tmp; return r; diff --git a/src/test/test_util.c b/src/test/test_util.c index 99fee4c5a..888038bea 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -3163,6 +3163,21 @@ test_util_sscanf(void *arg) test_feq(d3, -900123123.2000787); test_feq(d4, 3.2); + /* missing float */ + r = tor_sscanf("3 ", "%d %lf", &int1, &d1); + tt_int_op(r, OP_EQ, 1); + tt_int_op(int1, OP_EQ, 3); + + /* not a float */ + r = tor_sscanf("999 notafloat", "%d %lf", &int1, &d1); + tt_int_op(r, OP_EQ, 1); + tt_int_op(int1, OP_EQ, 999); + + /* %s but no buffer. */ + char *nullbuf = NULL; + r = tor_sscanf("hello", "%3s", nullbuf); + tt_int_op(r, OP_EQ, 0); + done: tor_free(huge); }

1 0

[tor/master] Merge remote-tracking branch 'public/string_coverage'
by nickm＠torproject.org 03 Aug '18

03 Aug '18

commit 622a057e7e5d9f757d040283c7089d1fab847ae3 Merge: af9787944 ee12c11dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 3 07:03:29 2018 -0400 Merge remote-tracking branch 'public/string_coverage' src/lib/string/printf.c | 2 +- src/test/test_util.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug: 27020: RBM build fails with runc version 1.0.1
by boklm＠torproject.org 03 Aug '18

03 Aug '18

commit 3960ad5d91701ef9b22e57eef8532e7a2e19b9db Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Aug 1 11:29:46 2018 -0700 Bug: 27020: RBM build fails with runc version 1.0.1 runc version on Ubuntu 18.04 is 1.0.1 which is not currently handled in rbm.conf, so the runc_spec100 flag does not get set properly. This patch changes it so the runc_spec100 flag is set if a spec string greater than 1.0.0 is found. --- rbm.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rbm.conf b/rbm.conf index d046d86..8cfa5e2 100644 --- a/rbm.conf +++ b/rbm.conf @@ -390,11 +390,11 @@ ENV: my ($out) = capture_exec('sudo', 'runc', '--version'); return !($out =~ m/^runc version 0.1.1/); }, - # runc_spec100 is true if runc spec is exactly 1.0.0 + # runc_spec100 is true if runc spec is at least 1.0.0 # We will need to update this when there is a new spec version available runc_spec100 => sub { my ($out) = capture_exec('sudo', 'runc', '--version'); - return $out =~ m/^spec: 1\.0\.0$/m; + return $out =~ m/^.*spec: 1\.[0-9]+\.[0-9]+$/m; }, }, )

1 0

[metrics-web/master] Fix bug in generating Tor Messenger CSV file.
by karsten＠torproject.org 03 Aug '18

03 Aug '18

commit afc2fc4fa5f19b592dd8f09d6397fd244adfbe91 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 3 10:32:57 2018 +0200 Fix bug in generating Tor Messenger CSV file. --- src/main/R/rserver/graphs.R | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/R/rserver/graphs.R b/src/main/R/rserver/graphs.R index 56c8a55..12a80e9 100644 --- a/src/main/R/rserver/graphs.R +++ b/src/main/R/rserver/graphs.R @@ -1489,7 +1489,8 @@ plot_webstats_tm <- function(start_p, end_p, path_p) { write_webstats_tm <- function(start_p = NULL, end_p = NULL, path_p) { prepare_webstats_tm(start_p, end_p) %>% rename(date = log_date) %>% - spread(request_type, count) %>% + mutate(request_type = factor(request_type, levels = c("tmid", "tmup"))) %>% + spread(request_type, count, drop = FALSE) %>% rename(initial_downloads = tmid, update_pings = tmup) %>% write.csv(path_p, quote = FALSE, row.names = FALSE, na = "") }

1 0

[translation-tools/master] changing localization coordinator emails
by emmapeel＠torproject.org 02 Aug '18

02 Aug '18

commit f3cb7da409f0a85cc9537fb8a5edd1d579a1292b Author: emma peel <emma.peel(a)riseup.net> Date: Thu Aug 2 20:48:33 2018 +0000 changing localization coordinator emails --- crontab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crontab b/crontab index 79374f1..e7c018b 100644 --- a/crontab +++ b/crontab @@ -1,4 +1,4 @@ MAILTO=sebastian(a)torproject.org -MAILTO=colin(a)torproject.org +MAILTO=emmapeel(a)torproject.org 15,45 * * * * /srv/translation.torproject.org/tools/update_translations

1 0

[onionoo/master] Add change log entry for thin jar file.
by karsten＠torproject.org 02 Aug '18

02 Aug '18

commit c1fa0c31f67a4701f6ae71282bf9df5d6b0e2965 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 2 21:28:42 2018 +0200 Add change log entry for thin jar file. Resolves #26969. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f3a958..c5f752d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ * Minor changes - Extend internal statistics to log less frequently requested resources and parameter combinations without counts. + - Provide a thin jar file without dependencies. # Changes in version 6.1-1.15.0 - 2018-07-16

1 0

[onionoo/master] Update metrics-base.
by karsten＠torproject.org 02 Aug '18

02 Aug '18

commit 31af3b4929f84ab71593498213a9dad81b2190cf Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 2 21:24:28 2018 +0200 Update metrics-base. --- src/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build b/src/build index 23c6e0b..08514a3 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 23c6e0be5fab9463f137615053ef412e4da2315e +Subproject commit 08514a32afefbeef848b80f9a338ee840c282604

1 0

[onionoo/master] Fix and extend test for #26919 logging patch.
by karsten＠torproject.org 02 Aug '18

02 Aug '18

commit 7172978cde0c8de518c17537352c7e202d0fdb6d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 2 21:21:45 2018 +0200 Fix and extend test for #26919 logging patch. --- .../torproject/onionoo/server/PerformanceMetricsTest.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/torproject/onionoo/server/PerformanceMetricsTest.java b/src/test/java/org/torproject/onionoo/server/PerformanceMetricsTest.java index 80328e5..e3d60ef 100644 --- a/src/test/java/org/torproject/onionoo/server/PerformanceMetricsTest.java +++ b/src/test/java/org/torproject/onionoo/server/PerformanceMetricsTest.java @@ -85,13 +85,23 @@ public class PerformanceMetricsTest { } @Test - public void testMostFrequentStringAbcd() { + public void testMostFrequentStringAbbbbccddddeee() { MostFrequentString mfs = new MostFrequentString(); mfs.addString("A"); mfs.addString("B"); + mfs.addString("B"); + mfs.addString("B"); + mfs.addString("B"); + mfs.addString("C"); mfs.addString("C"); mfs.addString("D"); - assertEquals("A (1), B (1), C (1)", mfs.toString()); + mfs.addString("D"); + mfs.addString("D"); + mfs.addString("D"); + mfs.addString("E"); + mfs.addString("E"); + mfs.addString("E"); + assertEquals("B (4), D (4), E (3), A, C", mfs.toString()); } @Test

1 0