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

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

19 Mar '19

commit 17e3eea68538f81a1375009fa6881ad89e11d5db Merge: 5d41e2223 cc23afddd Author: teor <teor(a)torproject.org> Date: Tue Mar 19 15:43:05 2019 +1000 Merge remote-tracking branch 'tor-github/pr/727' into maint-0.3.5 changes/bug29530_035 | 5 +++++ src/test/test_address.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-)

1 0

[tor/master] Changes file for backporting 29530 to 0.3.5
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit cc23afddd1d49f3c947020c0c41179a852d9dc7d Author: teor <teor(a)torproject.org> Date: Tue Feb 26 09:58:52 2019 +1000 Changes file for backporting 29530 to 0.3.5 --- changes/bug29530_035 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug29530_035 b/changes/bug29530_035 new file mode 100644 index 000000000..6dfcd51e7 --- /dev/null +++ b/changes/bug29530_035 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing): + - Downgrade some LOG_ERR messages in the address/* tests to warnings. + The LOG_ERR messages were occurring when we had no configured network. + We were failing the unit tests, because we backported 28668 to 0.3.5.8, + but did not backport 29530. Fixes bug 29530; bugfix on 0.3.5.8.

1 0

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

19 Mar '19

commit 4c22c11136bd05cceccb13ef00f2a78780c83be1 Merge: 0aaeec19e b4483edce Author: teor <teor(a)torproject.org> Date: Tue Mar 19 15:43:42 2019 +1000 Merge branch 'maint-0.4.0' changes/bug29530_035 | 5 +++++ 1 file changed, 5 insertions(+)

1 0

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

19 Mar '19

commit 7b9eb0a139cf29b7cfc12eff8a3bf439e9c5acc0 Merge: 75edf0348 17e3eea68 Author: teor <teor(a)torproject.org> Date: Tue Mar 19 15:43:28 2019 +1000 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug29530_035 | 5 +++++ src/test/test_address.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.0] Downgrade some LOG_ERR messages in the address/* tests to warnings
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit e138bb8ffc6557a1ba291b9aa6302d7dea85eb65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 14:02:32 2019 -0500 Downgrade some LOG_ERR messages in the address/* tests to warnings Fixes bug 29530, where the LOG_ERR messages were occurring when we had no configured network, and so we were failing the unit tests because of the recently-merged #28668. Commit message edited by teor: We backported 28668 and released it in 0.3.5.8. This commit backports 29530 to 0.3.5. Fixes bug 29530 in Tor 0.3.5.8. --- src/test/test_address.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index cfb32b855..c33c30aee 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -744,7 +744,7 @@ test_address_get_if_addrs_list_internal(void *arg) (void)arg; - results = get_interface_address_list(LOG_ERR, 1); + results = get_interface_address_list(LOG_WARN, 1); tt_ptr_op(results, OP_NE, NULL); /* When the network is down, a system might not have any non-local @@ -775,7 +775,7 @@ test_address_get_if_addrs_list_no_internal(void *arg) (void)arg; - results = get_interface_address_list(LOG_ERR, 0); + results = get_interface_address_list(LOG_WARN, 0); tt_ptr_op(results, OP_NE, NULL); /* Work even on systems with only internal IPv4 addresses */ @@ -986,7 +986,7 @@ test_address_get_if_addrs(void *arg) (void)arg; - rv = get_interface_address(LOG_ERR, &addr_h); + rv = get_interface_address(LOG_WARN, &addr_h); /* When the network is down, a system might not have any non-local * non-multicast IPv4 addresses, not even internal ones.

1 0

[tor/release-0.4.0] Changes file for backporting 29530 to 0.3.5
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit cc23afddd1d49f3c947020c0c41179a852d9dc7d Author: teor <teor(a)torproject.org> Date: Tue Feb 26 09:58:52 2019 +1000 Changes file for backporting 29530 to 0.3.5 --- changes/bug29530_035 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug29530_035 b/changes/bug29530_035 new file mode 100644 index 000000000..6dfcd51e7 --- /dev/null +++ b/changes/bug29530_035 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing): + - Downgrade some LOG_ERR messages in the address/* tests to warnings. + The LOG_ERR messages were occurring when we had no configured network. + We were failing the unit tests, because we backported 28668 to 0.3.5.8, + but did not backport 29530. Fixes bug 29530; bugfix on 0.3.5.8.

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/727' into maint-0.3.5
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit 17e3eea68538f81a1375009fa6881ad89e11d5db Merge: 5d41e2223 cc23afddd Author: teor <teor(a)torproject.org> Date: Tue Mar 19 15:43:05 2019 +1000 Merge remote-tracking branch 'tor-github/pr/727' into maint-0.3.5 changes/bug29530_035 | 5 +++++ src/test/test_address.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-)

1 0

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

19 Mar '19

commit b4483edce03be334ac320b812bfeae3bc2d5ee6b Merge: 1547fd99a 17e3eea68 Author: teor <teor(a)torproject.org> Date: Tue Mar 19 15:43:33 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug29530_035 | 5 +++++ 1 file changed, 5 insertions(+)

1 0

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

19 Mar '19

commit fcf8c1143b1997e0f3cc00717bfe0846f088f71a Merge: dfb8f0fee b4483edce Author: teor <teor(a)torproject.org> Date: Tue Mar 19 15:43:38 2019 +1000 Merge branch 'maint-0.4.0' into release-0.4.0 changes/bug29530_035 | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[tor/maint-0.3.5] Changes file for backporting 29530 to 0.3.5
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit cc23afddd1d49f3c947020c0c41179a852d9dc7d Author: teor <teor(a)torproject.org> Date: Tue Feb 26 09:58:52 2019 +1000 Changes file for backporting 29530 to 0.3.5 --- changes/bug29530_035 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug29530_035 b/changes/bug29530_035 new file mode 100644 index 000000000..6dfcd51e7 --- /dev/null +++ b/changes/bug29530_035 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing): + - Downgrade some LOG_ERR messages in the address/* tests to warnings. + The LOG_ERR messages were occurring when we had no configured network. + We were failing the unit tests, because we backported 28668 to 0.3.5.8, + but did not backport 29530. Fixes bug 29530; bugfix on 0.3.5.8.

1 0