commit 72e4ed86347a9426788265379befe8dd7be6b0d6 Merge: a985f554c 2d6f00e45 Author: teor teor@torproject.org Date: Thu Apr 9 11:03:37 2020 +1000

Merge branch 'maint-0.4.3' into release-0.4.3

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