Merge branch 'ticket30428_041_02_squashed'

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

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

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