commit 055f5d4d1b2c8ea5a85691f7110e82a9c468b6dd Merge: c17ab20ac 501b5174d Author: teor teor@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(-)