commit 987f2fa50ac26af61917c7a6e13dc62f3ddb23ee Merge: 26fd31fef d380acaec Author: teor teor@torproject.org Date: Thu Apr 9 11:03:20 2020 +1000

Merge branch 'maint-0.3.5' into maint-0.4.1

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(-)