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

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

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

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

diff --cc src/test/test_dos.c
Simple merge