commit 6dd377dd64b658853dab0b17bcdc34999c6cce10 Merge: 8cdb8f97a 8bd9b2a6a Author: teor teor@torproject.org Date: Thu Mar 14 06:39:49 2019 +1000
Merge branch 'maint-0.2.9' into release-0.2.9
changes/bug23512 | 6 +++ changes/bug23681 | 5 +++ changes/bug25733 | 4 ++ changes/bug27073 | 4 ++ changes/bug28096 | 13 ++++++ src/common/compat.c | 95 +++++++++++++++++++++++++++------------- src/or/channeltls.h | 2 + src/or/circuitlist.c | 59 +++++++++++++++++++++++++ src/or/circuitlist.h | 2 + src/or/circuitstats.c | 20 ++++++++- src/or/circuituse.c | 18 ++++---- src/or/or.h | 12 +++++ src/or/relay.c | 1 + src/or/rephist.c | 26 ++++++----- src/or/rephist.h | 10 +++-- src/test/test_relay.c | 113 +++++++++++++++++++++++++++++++++++++++++++++--- src/test/test_threads.c | 30 ++++++++----- 17 files changed, 345 insertions(+), 75 deletions(-)