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

[tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5
by teor＠torproject.org 01 Mar '19

01 Mar '19

commit 1c248fa27d978a3a20f29ea76cc23c4c4604d1a0 Merge: de0969ef7 f56645917 Author: teor <teor(a)torproject.org> Date: Fri Mar 1 14:16:59 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5

1 0

[tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by teor＠torproject.org 01 Mar '19

01 Mar '19

commit f56645917e6c4743b285eb82e797accb3723399a Merge: 6a61a020e 76b55fde8 Author: teor <teor(a)torproject.org> Date: Fri Mar 1 14:16:22 2019 +1000 Merge branch 'maint-0.3.3' into maint-0.3.4

1 0

[tor/master] Merge branch 'maint-0.4.0'
by teor＠torproject.org 01 Mar '19

01 Mar '19

commit 2d5c6cddc434cb04ca8a1ce1f2922d6f639d229a Merge: 9256b02cc 955a62239 Author: teor <teor(a)torproject.org> Date: Fri Mar 1 14:17:54 2019 +1000 Merge branch 'maint-0.4.0'

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 01 Mar '19

01 Mar '19

commit 955a622391192ff9cb65dddcb110532616f890ff Merge: dc19d65c3 1c248fa27 Author: teor <teor(a)torproject.org> Date: Fri Mar 1 14:17:31 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0

1 0

[tor/release-0.2.9] Make circuit_log_ancient_one_hop_circuits() ignore established service rendezvous
by teor＠torproject.org 01 Mar '19

01 Mar '19

commit 7ce8d5513ba388259e4e251d49183ef0fe9c8fa8 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Feb 5 10:52:17 2018 -0500 Make circuit_log_ancient_one_hop_circuits() ignore established service rendezvous Services can keep rendezvous circuits for a while so don't log them if tor is a single onion service. Fixes #25116 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug25116 | 4 ++++ src/or/circuituse.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/bug25116 b/changes/bug25116 new file mode 100644 index 000000000..b3e73feea --- /dev/null +++ b/changes/bug25116 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden service, heartbeat): + - Don't log in the heartbeat any long term established one hop rendezvous + points if tor is a single onion service. Fixes bug 25116; bugfix on + 0.2.9.6-rc; diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 84574cd5b..96cd3cd7e 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -808,10 +808,10 @@ circuit_log_ancient_one_hop_circuits(int age) if (circ->timestamp_created.tv_sec >= cutoff) continue; /* Single Onion Services deliberately make long term one-hop intro - * connections. We only ignore active intro point connections, if we take - * a long time establishing, that's worth logging. */ + * and rendezvous connections. Don't log the established ones. */ if (rend_service_allow_non_anonymous_connection(options) && - circ->purpose == CIRCUIT_PURPOSE_S_INTRO) + (circ->purpose == CIRCUIT_PURPOSE_S_INTRO || + circ->purpose == CIRCUIT_PURPOSE_S_REND_JOINED)) continue; /* Tor2web deliberately makes long term one-hop rend connections, * particularly when Tor2webRendezvousPoints is used. We only ignore

1 0

[tor/release-0.2.9] test: Bump to 10 msec gap in the monotonic test
by teor＠torproject.org 01 Mar '19

01 Mar '19

commit fe3dfe7e38b4ad0c11ff05b7dbd0a9b1d7efc4a8 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 7 10:23:24 2018 -0500 test: Bump to 10 msec gap in the monotonic test On slow system, 1 msec between one read and the other was too tight. For instance, it failed on armel with a 4msec gap: https://buildd.debian.org/status/package.php?p=tor&suite=experimental Increase to 10 msec for now to address slow system. It is important that we keep this OP_LE test in so we make sure the msec/usec/nsec read aren't desynchronized by huge gaps. We'll adjust again if we ever encounter a system that goes slower than 10 msec between calls. Fixes #25113 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug25113 | 5 +++++ src/test/test_util.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/changes/bug25113 b/changes/bug25113 new file mode 100644 index 000000000..4a020b784 --- /dev/null +++ b/changes/bug25113 @@ -0,0 +1,5 @@ + o Minor bugfixes (unit test, monotonic time): + - Bump a gap of 1msec to 10msec used in the monotonic time test that makes + sure the nsec/usec/msec time read are synchronized. This change was + needed to accommodate slow system like armel or when the clock_gettime() + is not a VDSO on the running kernel. Fixes bug 25113; bugfix on 0.2.9.1. diff --git a/src/test/test_util.c b/src/test/test_util.c index 0b707caee..dd122b250 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -5541,10 +5541,10 @@ test_util_monotonic_time(void *arg) tt_u64_op(usec1, OP_GE, nsec1 / 1000); tt_u64_op(msecc1, OP_GE, nsecc1 / 1000000); tt_u64_op(usecc1, OP_GE, nsecc1 / 1000); - tt_u64_op(msec1, OP_LE, nsec1 / 1000000 + 1); - tt_u64_op(usec1, OP_LE, nsec1 / 1000 + 1000); - tt_u64_op(msecc1, OP_LE, nsecc1 / 1000000 + 1); - tt_u64_op(usecc1, OP_LE, nsecc1 / 1000 + 1000); + tt_u64_op(msec1, OP_LE, nsec1 / 1000000 + 10); + tt_u64_op(usec1, OP_LE, nsec1 / 1000 + 10000); + tt_u64_op(msecc1, OP_LE, nsecc1 / 1000000 + 10); + tt_u64_op(usecc1, OP_LE, nsecc1 / 1000 + 10000); done: ;

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9
by teor＠torproject.org 01 Mar '19

01 Mar '19

commit c1ab53847907166cdc93727cee5877c68e8bdd01 Merge: ecbc2e80a fe3dfe7e3 Author: teor <teor(a)torproject.org> Date: Fri Mar 1 14:14:51 2019 +1000 Merge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9 changes/bug25113 | 5 +++++ src/test/test_util.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-)

1 0

[tor/release-0.2.9] When extending a circuit's path length, clear onehop_tunnel.
by teor＠torproject.org 01 Mar '19

01 Mar '19

commit 33a80921a2e7bbf128c27a1a0c4903a9a322708a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 26 09:17:50 2018 -0400 When extending a circuit's path length, clear onehop_tunnel. There was a nonfatal assertion in pathbias_should_count that would trigger if onehop_tunnel was set, but the desired_path_length was greater than 1. This patch fixes that. Fixes bug 24903; bugfix on 0.2.5.2-alpha. --- changes/bug24903 | 5 +++++ src/or/control.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/changes/bug24903 b/changes/bug24903 new file mode 100644 index 000000000..01c9b53f2 --- /dev/null +++ b/changes/bug24903 @@ -0,0 +1,5 @@ + o Minor bugfixes (controller, reliability): + - Avoid a (nonfatal) assertion failure when extending a one-hop circuit + from the controller to become a multihop circuit. Fixes bug 24903; + bugfix on 0.2.5.2-alpha. + diff --git a/src/or/control.c b/src/or/control.c index 03d9fcee2..ff7f2e8b8 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3364,6 +3364,9 @@ handle_control_extendcircuit(control_connection_t *conn, uint32_t len, tor_assert(info); } circuit_append_new_exit(circ, info); + if (circ->build_state->desired_path_len > 1) { + circ->build_state->onehop_tunnel = 0; + } extend_info_free(info); first_node = 0; });

1 0

[tor/release-0.2.9] Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9
by teor＠torproject.org 01 Mar '19

01 Mar '19

commit 7786198eef31b9c608c3e13ae143cd430319af50 Merge: c1ab53847 33a80921a Author: teor <teor(a)torproject.org> Date: Fri Mar 1 14:15:00 2019 +1000 Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9 changes/bug24903 | 5 +++++ src/or/control.c | 3 +++ 2 files changed, 8 insertions(+)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.3
by teor＠torproject.org 01 Mar '19

01 Mar '19

commit 76b55fde815f3f61161ba21adf90154fc2e53907 Merge: be71cce9f 7786198ee Author: teor <teor(a)torproject.org> Date: Fri Mar 1 14:15:59 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.3

1 0