commit 94878cf1eaa59f4aae6bc88c93d55c4ecba1e0d9 Merge: c0447033f 1f4a73133 Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 31 09:35:07 2018 -0500

Merge remote-tracking branch 'dgoulet/ticket24902_029_05'

src/or/dos.c | 82 ++++++++++++++++++++--------- src/or/dos.h | 2 +- src/test/test_dos.c | 148 +++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 205 insertions(+), 27 deletions(-)