Merge remote-tracking branch 'tor-github/pr/1801/head'

diff --cc scripts/maint/practracker/exceptions.txt
Simple merge

diff --cc src/app/config/config.h
Simple merge

diff --cc src/core/or/channel.c
Simple merge

diff --cc src/core/or/onion.h
Simple merge

diff --cc src/feature/relay/relay_config.c
Simple merge