commit c88fce1323205db4809bf2a69fa9a29c71ffb4c1 Merge: 76177368c 055f5d4d1 Author: teor teor@torproject.org Date: Mon Nov 25 12:37:03 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
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(-)