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

[teor at torproject.org]

commit 03e77ef036e41486b8bfe138d11790c928f49f35
Merge: 54e2d0dc2 1bde356bf
Author: teor <teor at torproject.org>
Date:   Wed Nov 6 11:19:38 2019 +1000

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