Merge remote-tracking branch 'tor-github/pr/998'

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

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

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

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