[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.1

[teor at torproject.org]

commit 5298113da98f13cfaad4a9ab7b5ac8baa6c37279
Merge: 0ff3e8f4a b9c7c61ea
Author: teor <teor at torproject.org>
Date:   Wed Feb 12 12:21:57 2020 +1000

    Merge branch 'maint-0.3.5' into maint-0.4.1

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