[tor-commits] [tor/master] Merge remote-tracking branch 'origin/master'

[nickm at torproject.org]

commit 100221baac7e0c0533df009d5b65eae27af12123
Merge: 09614e0c9d 83ab6adb10
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 23 08:43:19 2021 -0500

    Merge remote-tracking branch 'origin/master'

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