commit 4b914dea025806b47ba91e5e0a713fb266805a27 Merge: 5d53b2317 52f61ec83 Author: teor teor@torproject.org Date: Sat Mar 21 04:02:08 2020 +1000

Merge branch 'bug32588_043' into bug32588_master

changes/bug32588 | 4 ++ src/app/config/config.c | 5 +- src/app/config/config.h | 4 ++ src/feature/relay/router.c | 77 ++++++++++++++++++----------- src/feature/relay/router.h | 2 + src/test/test_config.c | 66 +++++++++++++++++++++++++ src/test/test_router.c | 117 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 243 insertions(+), 32 deletions(-)