commit 388210ceb9f3ac236f6e35de17092c7c54f163fe Merge: eef815eb5 3008255ae Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 29 12:56:50 2020 -0400

Merge branch 'maint-0.4.3' into release-0.4.3

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(-)