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

[tor/release-0.4.6] Merge branch 'maint-0.4.5' into release-0.4.5
by dgoulet＠torproject.org 07 May '21

07 May '21

commit 65d268c77bedef363b786924a0ec7e254af9945f Merge: 9e6a276c26 3c0d398847 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 27 09:36:39 2021 -0500 Merge branch 'maint-0.4.5' into release-0.4.5 changes/ticket40254 | 4 ++++ src/feature/relay/relay_find_addr.c | 24 +++++++++++++++++++++++ src/feature/relay/router.c | 39 ++++++++++++------------------------- src/test/test_relay.c | 33 ++++++++++++++++++++++--------- 4 files changed, 64 insertions(+), 36 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.5' into release-0.4.5
by dgoulet＠torproject.org 07 May '21

07 May '21

commit 6134379c4a36eaa2ee0809482b3b6630f03c7871 Merge: 65d268c77b 26a07287a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 11:20:21 2021 -0500 Merge branch 'maint-0.4.5' into release-0.4.5 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.3' into maint-0.4.4
by dgoulet＠torproject.org 07 May '21

07 May '21

commit bf29d3b4ae865213706ee19095262f669716f766 Merge: f8fea8b979 7ae74203e1 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:00:17 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/ticket40165 | 5 +++++ changes/ticket40170 | 3 +++ configure.ac | 19 ++++++++++++++++++- src/lib/crypt_ops/compat_openssl.h | 5 ----- src/lib/crypt_ops/crypto_openssl_mgt.c | 13 +++++++++++-- src/lib/crypt_ops/crypto_openssl_mgt.h | 3 +-- src/test/test_tortls_openssl.c | 3 +-- 7 files changed, 39 insertions(+), 12 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.5' into release-0.4.5
by dgoulet＠torproject.org 07 May '21

07 May '21

commit 28ae2abb855bfe0d1cc007ce3dc970f119d0ffe3 Merge: 6134379c4a 4f21b9503f Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:00:17 2021 -0500 Merge branch 'maint-0.4.5' into release-0.4.5

1 0

[tor/release-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.3
by dgoulet＠torproject.org 07 May '21

07 May '21

commit 7ae74203e13de85d52fdde16ffaf06e2366c8944 Merge: c3ed4b2e56 2cf1365c17 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:00:17 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/ticket40165 | 5 +++++ changes/ticket40170 | 3 +++ configure.ac | 19 ++++++++++++++++++- src/lib/crypt_ops/compat_openssl.h | 5 ----- src/lib/crypt_ops/crypto_openssl_mgt.c | 13 +++++++++++-- src/lib/crypt_ops/crypto_openssl_mgt.h | 3 +-- src/test/test_tortls_openssl.c | 3 +-- 7 files changed, 39 insertions(+), 12 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'tor-gitlab/mr/186' into maint-0.3.5
by dgoulet＠torproject.org 07 May '21

07 May '21

commit 2cf1365c17822f5e925c4c0bc3bd0367a3a657a8 Merge: 3ebf75993f c48d25ac8d Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:00:10 2021 -0500 Merge branch 'tor-gitlab/mr/186' into maint-0.3.5 changes/ticket40165 | 5 +++++ changes/ticket40170 | 3 +++ configure.ac | 19 ++++++++++++++++++- src/lib/crypt_ops/compat_openssl.h | 5 ----- src/lib/crypt_ops/crypto_openssl_mgt.c | 13 +++++++++++-- src/lib/crypt_ops/crypto_openssl_mgt.h | 3 +-- src/test/test_tortls_openssl.c | 3 +-- 7 files changed, 39 insertions(+), 12 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.4' into maint-0.4.5
by dgoulet＠torproject.org 07 May '21

07 May '21

commit 4f21b9503fc5ca2c505c0d561dbaf73a384e0435 Merge: 26a07287a4 bf29d3b4ae Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:00:17 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5

1 0

[tor/release-0.4.6] Merge branch 'tor-gitlab/mr/140' into maint-0.3.5
by dgoulet＠torproject.org 07 May '21

07 May '21

commit 8f13257ccd99772473949200e72e90ba2dd419a1 Merge: 2cf1365c17 248cbc2d22 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:02:39 2021 -0500 Merge branch 'tor-gitlab/mr/140' into maint-0.3.5 changes/bug40117 | 5 +++++ src/feature/rend/rendmid.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.3
by dgoulet＠torproject.org 07 May '21

07 May '21

commit ab58dd15774382689dd0c2a003d1a3dbaf2d9b5d Merge: 7ae74203e1 8f13257ccd Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:02:43 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/bug40117 | 5 +++++ src/feature/rend/rendmid.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.5' into release-0.4.5
by dgoulet＠torproject.org 07 May '21

07 May '21

commit 9cd318521d3f2af5c712b60f2928c49363cf9c03 Merge: 28ae2abb85 1fd9a81a2f Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:02:43 2021 -0500 Merge branch 'maint-0.4.5' into release-0.4.5

1 0