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

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

28 Jan '21

commit 2c4a2a93d34087afa833b25562341ba02276009c Merge: 1887231afb dd5fbc1bd9 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:14:10 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4

1 0

[tor/maint-0.4.5] Merge branch 'tor-gitlab/mr/256' into maint-0.4.4
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit 1887231afb377dbd2b68b815c354db492c515e08 Merge: ed0fcfd2b8 b3652f2104 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:12:01 2021 -0500 Merge branch 'tor-gitlab/mr/256' into maint-0.4.4 changes/ticket40237 | 5 +++ src/core/mainloop/mainloop.c | 3 +- src/feature/hs/hs_cache.c | 5 ++- src/feature/hs/hs_client.c | 8 +++-- src/feature/hs/hs_common.c | 12 ++++++-- src/feature/hs/hs_service.c | 9 ++++-- src/feature/hs_common/shared_random_client.c | 26 ++++++++++------ src/feature/nodelist/nodelist.c | 2 +- src/test/test_hs_cache.c | 19 ++++++------ src/test/test_hs_client.c | 46 +++++++++++++++------------- src/test/test_hs_common.c | 36 ++++++++++++++-------- src/test/test_hs_service.c | 40 ++++++++++++------------ src/test/test_shared_random.c | 22 ++++++++++--- 13 files changed, 144 insertions(+), 89 deletions(-)

1 0

[tor/maint-0.4.5] Merge branch 'tor-gitlab/mr/254' into maint-0.3.5
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit 1bdccc03a94c6f4af297d2114d3a237d33172f1f Merge: 045db909c2 04b0263974 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:10:39 2021 -0500 Merge branch 'tor-gitlab/mr/254' into maint-0.3.5 changes/ticket40237 | 5 ++++ src/core/mainloop/mainloop.c | 3 ++- src/feature/hs/hs_cache.c | 5 +++- src/feature/hs/hs_client.c | 8 ++++--- src/feature/hs/hs_common.c | 12 +++++++--- src/feature/hs/hs_service.c | 7 ++++-- src/feature/hs_common/shared_random_client.c | 23 ++++++++++++------ src/feature/nodelist/nodelist.c | 2 +- src/test/test_hs_cache.c | 7 +++--- src/test/test_hs_client.c | 36 +++++++++++++++------------- src/test/test_hs_common.c | 36 ++++++++++++++++++---------- src/test/test_hs_service.c | 21 ++++++++-------- src/test/test_shared_random.c | 22 +++++++++++++---- 13 files changed, 122 insertions(+), 65 deletions(-)

1 0

[tor/maint-0.4.5] Merge branch 'maint-0.4.3' into maint-0.4.4
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit 2c4a2a93d34087afa833b25562341ba02276009c Merge: 1887231afb dd5fbc1bd9 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:14:10 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4

1 0

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

28 Jan '21

commit dd5fbc1bd9d54d191240ac4e15b5324fb83a903d Merge: 5c89197c9f 1bdccc03a9 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:14:10 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3

1 0

[tor/master] Merge branch 'tor-gitlab/mr/254' into maint-0.3.5
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit 1bdccc03a94c6f4af297d2114d3a237d33172f1f Merge: 045db909c2 04b0263974 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:10:39 2021 -0500 Merge branch 'tor-gitlab/mr/254' into maint-0.3.5 changes/ticket40237 | 5 ++++ src/core/mainloop/mainloop.c | 3 ++- src/feature/hs/hs_cache.c | 5 +++- src/feature/hs/hs_client.c | 8 ++++--- src/feature/hs/hs_common.c | 12 +++++++--- src/feature/hs/hs_service.c | 7 ++++-- src/feature/hs_common/shared_random_client.c | 23 ++++++++++++------ src/feature/nodelist/nodelist.c | 2 +- src/test/test_hs_cache.c | 7 +++--- src/test/test_hs_client.c | 36 +++++++++++++++------------- src/test/test_hs_common.c | 36 ++++++++++++++++++---------- src/test/test_hs_service.c | 21 ++++++++-------- src/test/test_shared_random.c | 22 +++++++++++++---- 13 files changed, 122 insertions(+), 65 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.4' into maint-0.4.5
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit c652740515cdfad30d733b079a78154e85f3bb41 Merge: 09901aeb07 2c4a2a93d3 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:14:10 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5

1 0

[tor/master] Merge branch 'maint-0.4.5'
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit 8cd696ca048d534861f7ec616922bace6b1b5416 Merge: ba82b685a5 c652740515 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:14:10 2021 -0500 Merge branch 'maint-0.4.5'

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.3
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit dd5fbc1bd9d54d191240ac4e15b5324fb83a903d Merge: 5c89197c9f 1bdccc03a9 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:14:10 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3

1 0

[tor/master] Merge branch 'tor-gitlab/mr/255' into maint-0.4.3
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit 5c89197c9f197f39d18872e508635cd4864566aa Merge: 6186288eb6 0485c7ddba Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:11:33 2021 -0500 Merge branch 'tor-gitlab/mr/255' into maint-0.4.3 changes/ticket40237 | 5 +++ src/core/mainloop/mainloop.c | 3 +- src/feature/hs/hs_cache.c | 5 ++- src/feature/hs/hs_client.c | 8 +++-- src/feature/hs/hs_common.c | 12 ++++++-- src/feature/hs/hs_service.c | 7 +++-- src/feature/hs_common/shared_random_client.c | 23 +++++++++----- src/feature/nodelist/nodelist.c | 2 +- src/test/test_hs_cache.c | 19 ++++++------ src/test/test_hs_client.c | 46 +++++++++++++++------------- src/test/test_hs_common.c | 36 ++++++++++++++-------- src/test/test_hs_service.c | 21 +++++++------ src/test/test_shared_random.c | 22 ++++++++++--- 13 files changed, 133 insertions(+), 76 deletions(-)

1 0