[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/320'

[nickm at torproject.org]

commit bc799a1eaf85fc218156e014c83cc1d5c096e16a
Merge: 100221baac c96465259a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 23 09:29:49 2021 -0500

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

 changes/changes40308   |  5 ++++
 src/core/or/dos.c      | 74 ++++++++++++++++++++++++--------------------------
 src/test/test_status.c |  4 ++-
 3 files changed, 43 insertions(+), 40 deletions(-)