commit 58b23b33e45f1aa643e890543ecc0f43878cf038 Merge: c80052f603 741edf1b45 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 7 09:29:17 2020 -0400

Merge branch 'maint-0.3.5' into release-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(-)