commit 83ab6adb10d4e6e10eccbbb65120d3e9f1a675f6 Merge: 8907800549 45113b648b Author: Alexander Færøy ahf@torproject.org Date: Mon Feb 22 20:52:44 2021 +0000

Merge remote-tracking branch 'tor-gitlab/mr/276'

changes/ticket40253 | 3 + doc/man/tor.1.txt | 24 ++++++ src/core/or/dos.c | 179 +++++++++++++++++++++++++++++++++++----- src/core/or/dos.h | 37 ++++++++- src/core/or/dos_options.inc | 12 +++ src/feature/stats/geoip_stats.c | 2 + src/test/test_dos.c | 65 ++++++++++++++- 7 files changed, 297 insertions(+), 25 deletions(-)