commit 741edf1b458f56f516a02aa72bfae99371b3ec5a Merge: b404f085ad 96ca14d989 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 7 09:29:07 2020 -0400

Merge remote-tracking branch 'tor-github/pr/1827/head' into maint-0.3.5

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 | 119 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 245 insertions(+), 32 deletions(-)