commit 1d9e1da6ee2a409f4a8f901969612fb679d12e89 Merge: cac7c6625 5df0b3662 Author: teor teor@torproject.org Date: Sat Aug 10 07:26:16 2019 +1000
Merge branch 'maint-0.3.5' into release-0.3.5
changes/bug28525 | 7 +++++++ changes/bug30041 | 5 +++++ changes/bug30561 | 6 ++++++ changes/bug30781 | 4 ++++ changes/bug31343 | 9 +++++++++ changes/ticket31374 | 4 ++++ src/core/mainloop/connection.c | 4 ++++ src/core/or/channeltls.c | 24 ++++++++++++++++++++---- src/feature/dirparse/routerparse.c | 3 +++ src/feature/nodelist/routerlist.c | 6 ++++-- src/lib/container/buffers.c | 11 +++++++++-- src/lib/net/address.c | 19 +++++++++++++++---- src/lib/string/printf.c | 16 +++++++++++++--- src/lib/time/compat_time.c | 2 +- src/test/test_addr.c | 18 ++++++++++++++++++ 15 files changed, 122 insertions(+), 16 deletions(-)