[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2

commit 958f6eb5c7b0f85197959970bd6bab5a54ecc30d Merge: c22601765 2d7e08d57 Author: teor <teor@torproject.org> Date: Thu Apr 9 11:03:30 2020 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 changes/ticket33491 | 6 ++++++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h | 3 ++- src/test/test_dos.c | 24 ++++++++++++------------ 5 files changed, 23 insertions(+), 16 deletions(-)