December 2016 - tor-commits - lists.torproject.org

[tor/maint-0.2.9] Merge remote-tracking branch 'dgoulet/bug20938_029_01' into maint-0.2.9
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit 87c000d19e40d97561076d043fdaa778bd48c124 Merge: a40d212 f3c040e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 11 20:40:01 2016 -0500 Merge remote-tracking branch 'dgoulet/bug20938_029_01' into maint-0.2.9 src/test/test_hs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit 3e4a1ed7bb1e67a81f47dc8067774d2907a15c81 Merge: 4c5eb0b 87c000d Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 11 20:40:12 2016 -0500 Merge branch 'maint-0.2.9' src/test/test_hs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/master] test: fix memory leak in single onion poisoning
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit f3c040e33e8d12c62794db48c33799b43a86864a Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Dec 9 12:59:38 2016 -0500 test: fix memory leak in single onion poisoning Closes #20938 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_hs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_hs.c b/src/test/test_hs.c index 690e07e..8237bbc 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -570,8 +570,8 @@ test_single_onion_poisoning(void *arg) tt_assert(ret == 0); } - service_1->directory = tor_strdup(dir1); - service_2->directory = tor_strdup(dir2); + service_1->directory = dir1; + service_2->directory = dir2; /* The services own the directory pointers now */ dir1 = dir2 = NULL; /* Add port to service 1 */

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug20938_029_01' into maint-0.2.9
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit 87c000d19e40d97561076d043fdaa778bd48c124 Merge: a40d212 f3c040e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 11 20:40:01 2016 -0500 Merge remote-tracking branch 'dgoulet/bug20938_029_01' into maint-0.2.9 src/test/test_hs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.9] test: fix memory leak in single onion poisoning
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit f3c040e33e8d12c62794db48c33799b43a86864a Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Dec 9 12:59:38 2016 -0500 test: fix memory leak in single onion poisoning Closes #20938 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_hs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_hs.c b/src/test/test_hs.c index 690e07e..8237bbc 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -570,8 +570,8 @@ test_single_onion_poisoning(void *arg) tt_assert(ret == 0); } - service_1->directory = tor_strdup(dir1); - service_2->directory = tor_strdup(dir2); + service_1->directory = dir1; + service_2->directory = dir2; /* The services own the directory pointers now */ dir1 = dir2 = NULL; /* Add port to service 1 */

1 0

[tor/release-0.2.9] Merge remote-tracking branch 'dgoulet/bug20938_029_01' into maint-0.2.9
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit 87c000d19e40d97561076d043fdaa778bd48c124 Merge: a40d212 f3c040e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 11 20:40:01 2016 -0500 Merge remote-tracking branch 'dgoulet/bug20938_029_01' into maint-0.2.9 src/test/test_hs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit 2a537af45236d37724edc0396b4366cd1eca7d1e Merge: d3874e4 87c000d Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 11 20:40:08 2016 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 src/test/test_hs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.9] Downgrade a harmless bug warning to info.
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit a40d2123834cd55e77ed76684a6d0f536a7c2f4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 9 08:43:09 2016 -0500 Downgrade a harmless bug warning to info. Makes 19926 less annoying in 0.2.9. In 0.3.0, we should actually fix this. --- changes/bug19926_029_info | 3 +++ src/or/connection_edge.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug19926_029_info b/changes/bug19926_029_info new file mode 100644 index 0000000..93fd81b --- /dev/null +++ b/changes/bug19926_029_info @@ -0,0 +1,3 @@ + o Minor bugfixes (logging): + - Downgrade a harmless log message about the pending_entry_connections + list from "warn" to "info". Mitigates bug 19926. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 7b9c315..3550d0e 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -865,7 +865,9 @@ connection_ap_attach_pending(int retry) continue; } if (conn->state != AP_CONN_STATE_CIRCUIT_WAIT) { - log_warn(LD_BUG, "%p is no longer in circuit_wait. Its current state " + // XXXX 030 -- this is downgraded in 0.2.9, since we apparently + // XXXX are running into it in practice. It's harmless. + log_info(LD_BUG, "%p is no longer in circuit_wait. Its current state " "is %s. Why is it on pending_entry_connections?", entry_conn, conn_state_to_string(conn->type, conn->state));

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit 4c5eb0b21d65a565aaeda4d44d4c8ff6e89bbec7 Merge: f2445fc a40d212 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 11 20:37:22 2016 -0500 Merge branch 'maint-0.2.9' This is an "ours" merge to avoid taking a40d2123834cd55e77ed7668, which quiets a warning we'd like to keep seeing in alphas.

1 0

[tor/release-0.2.9] Downgrade a harmless bug warning to info.
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit a40d2123834cd55e77ed76684a6d0f536a7c2f4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 9 08:43:09 2016 -0500 Downgrade a harmless bug warning to info. Makes 19926 less annoying in 0.2.9. In 0.3.0, we should actually fix this. --- changes/bug19926_029_info | 3 +++ src/or/connection_edge.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug19926_029_info b/changes/bug19926_029_info new file mode 100644 index 0000000..93fd81b --- /dev/null +++ b/changes/bug19926_029_info @@ -0,0 +1,3 @@ + o Minor bugfixes (logging): + - Downgrade a harmless log message about the pending_entry_connections + list from "warn" to "info". Mitigates bug 19926. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 7b9c315..3550d0e 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -865,7 +865,9 @@ connection_ap_attach_pending(int retry) continue; } if (conn->state != AP_CONN_STATE_CIRCUIT_WAIT) { - log_warn(LD_BUG, "%p is no longer in circuit_wait. Its current state " + // XXXX 030 -- this is downgraded in 0.2.9, since we apparently + // XXXX are running into it in practice. It's harmless. + log_info(LD_BUG, "%p is no longer in circuit_wait. Its current state " "is %s. Why is it on pending_entry_connections?", entry_conn, conn_state_to_string(conn->type, conn->state));

1 0