commit e241523195d2bc3ac03383aab9c88e612633d461 Merge: ff601da0d 03e77ef03 Author: teor teor@torproject.org Date: Wed Nov 6 11:19:42 2019 +1000

Merge branch 'maint-0.4.0' into release-0.4.0

changes/bug30916 | 4 +++ changes/bug31107 | 4 +++ changes/bug31408 | 5 ++++ changes/bug31837 | 5 ++++ changes/ticket31466 | 5 ++++ src/core/or/channeltls.c | 10 ++++++- src/core/or/connection_edge.c | 6 ++-- src/feature/relay/router.c | 18 +++++------- src/lib/fs/conffile.c | 10 ++++--- src/test/test_config.c | 68 +++++++++++++++++++++++++++++++++++++++++++ src/test/test_rebind.py | 16 +++++----- 11 files changed, 127 insertions(+), 24 deletions(-)