commit 49cb7d6ec4fd57922e80f16f859ef691491a92d7 Merge: 059a5795d 1407e2b16 Author: David Goulet <dgoulet@torproject.org> Date: Wed Nov 6 10:23:33 2019 -0500 Merge branch 'tor-github/pr/1491' src/core/or/dos.c | 13 +++++++++++-- src/feature/hs/hs_dos.c | 27 ++++++++++++++++++++++++--- src/feature/hs/hs_dos.h | 3 +++ src/test/test_status.c | 3 ++- 4 files changed, 40 insertions(+), 6 deletions(-)