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

[tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.3.5
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit 501b5174d84a121fe5932433e54b2929a5c2876d Merge: 400cee261 ed57a04a6 Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:35:11 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.3.5 changes/ticket28970 | 6 ++++++ src/feature/hs/hs_client.c | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.4.0' into maint-0.4.1
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit 26071aa3be8f26d7e81384f1d40bb1d5fe94cca0 Merge: 29eb7b07e 055f5d4d1 Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:37:07 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug30344 | 4 ++++ changes/bug31939 | 3 +++ changes/bug32108 | 8 ++++++++ changes/ticket28970 | 6 ++++++ changes/ticket31091 | 3 +++ changes/ticket31548 | 7 +++++++ changes/ticket32058 | 5 +++++ src/core/mainloop/connection.c | 18 ++++++++++++------ src/core/mainloop/mainloop.c | 12 +++++++++++- src/core/mainloop/periodic.c | 5 +++++ src/feature/client/transports.c | 6 ++---- src/feature/hs/hs_client.c | 8 ++++++-- src/feature/hs/hs_service.c | 9 +++++++++ src/lib/tls/buffers_tls.c | 4 ++-- 14 files changed, 83 insertions(+), 15 deletions(-)

1 0

[tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.0
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit c17ab20ac0d3efb1b9c46fa12685db5b09015481 Merge: ed6f2f61a a7ccd9a99 Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:36:41 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.0 changes/bug32108 | 8 ++++++++ src/core/mainloop/mainloop.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit 3d6545250e49b732292bb8ac1a3f01d198537b0b Merge: 969ee5d77 26071aa3b Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:37:15 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit 055f5d4d1b2c8ea5a85691f7110e82a9c468b6dd Merge: c17ab20ac 501b5174d Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:36:59 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug30344 | 4 ++++ changes/bug31939 | 3 +++ changes/ticket28970 | 6 ++++++ changes/ticket31548 | 7 +++++++ changes/ticket32058 | 5 +++++ src/core/mainloop/connection.c | 18 ++++++++++++------ src/core/mainloop/mainloop.c | 10 ++++++++++ src/core/mainloop/periodic.c | 5 +++++ src/feature/hs/hs_client.c | 8 ++++++-- src/feature/hs/hs_service.c | 9 +++++++++ src/lib/tls/buffers_tls.c | 4 ++-- 11 files changed, 69 insertions(+), 10 deletions(-)

1 0

[tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.3.5
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit 501b5174d84a121fe5932433e54b2929a5c2876d Merge: 400cee261 ed57a04a6 Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:35:11 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.3.5 changes/ticket28970 | 6 ++++++ src/feature/hs/hs_client.c | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.0
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit ed6f2f61a260a08d9e8f315e4397335fa39383be Merge: 329aa1c48 389b37246 Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:35:58 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.0 changes/ticket31091 | 3 +++ src/feature/client/transports.c | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.3.5
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit 400cee261ecccd024f6cb13dd1a940d4b9d0057b Merge: 54c01119e 4a8d49132 Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:34:29 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.3.5 changes/ticket32058 | 5 +++++ src/core/mainloop/periodic.c | 5 +++++ 2 files changed, 10 insertions(+)

1 0

[tor/maint-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit 26071aa3be8f26d7e81384f1d40bb1d5fe94cca0 Merge: 29eb7b07e 055f5d4d1 Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:37:07 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug30344 | 4 ++++ changes/bug31939 | 3 +++ changes/bug32108 | 8 ++++++++ changes/ticket28970 | 6 ++++++ changes/ticket31091 | 3 +++ changes/ticket31548 | 7 +++++++ changes/ticket32058 | 5 +++++ src/core/mainloop/connection.c | 18 ++++++++++++------ src/core/mainloop/mainloop.c | 12 +++++++++++- src/core/mainloop/periodic.c | 5 +++++ src/feature/client/transports.c | 6 ++---- src/feature/hs/hs_client.c | 8 ++++++-- src/feature/hs/hs_service.c | 9 +++++++++ src/lib/tls/buffers_tls.c | 4 ++-- 14 files changed, 83 insertions(+), 15 deletions(-)

1 0

[tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.0
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit c17ab20ac0d3efb1b9c46fa12685db5b09015481 Merge: ed6f2f61a a7ccd9a99 Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:36:41 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.0 changes/bug32108 | 8 ++++++++ src/core/mainloop/mainloop.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0