Merge branch 'maint-0.3.5' into maint-0.4.1

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

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

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