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

[tor/maint-0.4.4] Merge remote-tracking branch 'tor-gitlab/mr/163' into maint-0.4.3
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit b7f886beb43c098869742fbf55caef9bb8b702f2 Merge: a22bfe04bc f5ddc45647 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 12:53:44 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/163' into maint-0.4.3 changes/bug40113 | 3 +++ src/test/test_connection.c | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit 9b390a556e5030d67c235806b2c027513fb1679f Merge: b7f886beb4 faf7b550e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 12:53:52 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3

1 0

[tor/maint-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.3
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit 9b390a556e5030d67c235806b2c027513fb1679f Merge: b7f886beb4 faf7b550e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 12:53:52 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3

1 0

[tor/maint-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/143' into maint-0.3.5
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit faf7b550e740642e060518adc6a8624b036ed8e2 Merge: 2d5b21598e 020e8e41c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 12:53:30 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/143' into maint-0.3.5 changes/bug40113 | 3 +++ src/test/test_connection.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit d54cd853ad22ae02b3b41a10b3f166669455f8ae Merge: 4c82c2d1d4 9b390a556e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 12:53:52 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4

1 0

[tor/maint-0.4.4] Merge remote-tracking branch 'tor-gitlab/mr/143' into maint-0.3.5
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit faf7b550e740642e060518adc6a8624b036ed8e2 Merge: 2d5b21598e 020e8e41c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 12:53:30 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/143' into maint-0.3.5 changes/bug40113 | 3 +++ src/test/test_connection.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

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

19 Jan '21

commit 9b390a556e5030d67c235806b2c027513fb1679f Merge: b7f886beb4 faf7b550e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 12:53:52 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3

1 0

[tor/maint-0.4.3] Merge remote-tracking branch 'tor-gitlab/mr/143' into maint-0.3.5
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit faf7b550e740642e060518adc6a8624b036ed8e2 Merge: 2d5b21598e 020e8e41c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 12:53:30 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/143' into maint-0.3.5 changes/bug40113 | 3 +++ src/test/test_connection.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.3] Merge remote-tracking branch 'tor-gitlab/mr/163' into maint-0.4.3
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit b7f886beb43c098869742fbf55caef9bb8b702f2 Merge: a22bfe04bc f5ddc45647 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 12:53:44 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/163' into maint-0.4.3 changes/bug40113 | 3 +++ src/test/test_connection.c | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.4.3] Merge branch 'bug40133_035' into bug40133_043
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit f5ddc456472ed9198cda186e59239b5f7558c799 Merge: beffad8529 79d7773968 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 28 10:37:14 2020 -0400 Merge branch 'bug40133_035' into bug40133_043 changes/bug40113 | 3 +++ src/test/test_connection.c | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --cc src/test/test_connection.c index 7ed831f7d8,6f716f5758..05f7009bf4 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@@ -979,18 -893,11 +980,18 @@@ struct testcase_t connection_tests[] = CONNECTION_TESTCASE(get_basic, TT_FORK, test_conn_get_basic_st), CONNECTION_TESTCASE(get_rend, TT_FORK, test_conn_get_rend_st), CONNECTION_TESTCASE(get_rsrc, TT_FORK, test_conn_get_rsrc_st), + - CONNECTION_TESTCASE_ARG(download_status, TT_FORK, - test_conn_download_status_st, FLAV_MICRODESC), - CONNECTION_TESTCASE_ARG(download_status, TT_FORK, - test_conn_download_status_st, FLAV_NS), + CONNECTION_TESTCASE_ARG(download_status, TT_FORK, + test_conn_download_status_st, "microdesc"), + CONNECTION_TESTCASE_ARG(download_status, TT_FORK, + test_conn_download_status_st, "ns"), -//CONNECTION_TESTCASE(func_suffix, TT_FORK, setup_func_pair), + + CONNECTION_TESTCASE_ARG(https_proxy_connect, TT_FORK, + test_conn_proxy_connect_st, &PROXY_CONNECT_ARG), + CONNECTION_TESTCASE_ARG(haproxy_proxy_connect, TT_FORK, + test_conn_proxy_connect_st, &PROXY_HAPROXY_ARG), + - //CONNECTION_TESTCASE(func_suffix, TT_FORK, setup_func_pair), ++ //CONNECTION_TESTCASE(func_suffix, TT_FORK, setup_func_pair), { "failed_orconn_tracker", test_failed_orconn_tracker, TT_FORK, NULL, NULL }, END_OF_TESTCASES };

1 0