commit f65c123519f72da8f76c8f4d470165b07a86e6c1 Merge: 989909145 254c1bac4 Author: teor teor@torproject.org Date: Sat Aug 10 07:25:30 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug28525 | 7 +++++++ changes/bug30041 | 5 +++++ changes/bug30561 | 6 ++++++ changes/bug30781 | 4 ++++ changes/bug31343 | 9 +++++++++ changes/ticket31374 | 4 ++++ src/common/address.c | 19 +++++++++++++++---- src/common/compat.c | 17 +++++++++++++---- src/common/compat_time.c | 3 +-- src/or/buffers.c | 4 +++- src/or/channeltls.c | 23 +++++++++++++++++++---- src/or/connection.c | 4 ++++ src/or/rephist.h | 4 +--- src/or/routerlist.c | 7 ++++--- src/or/routerparse.c | 3 +++ src/test/test_addr.c | 18 ++++++++++++++++++ src/test/test_relay.c | 2 ++ 17 files changed, 118 insertions(+), 21 deletions(-)