commit d8cef680fccd7527903a56e9383f3239c38eace3 Merge: ec454830e b9c7c61ea Author: teor teor@torproject.org Date: Wed Feb 12 12:21:53 2020 +1000

Merge branch 'maint-0.3.5' into release-0.3.5

.travis.yml | 2 -- changes/bug32753 | 3 +++ changes/ticket33075 | 4 ++++ src/app/config/config.c | 2 +- src/feature/relay/router.c | 15 ++++++++++----- src/test/test_config.c | 22 +++++++++++++++++++--- 6 files changed, 37 insertions(+), 11 deletions(-)