[tor-commits] [tor] 04/04: Merge branch 'tor-gitlab/mr/711'

[gitolite role]

This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch main
in repository tor.

commit a2ec9a1199dbcad9e7ffada3e324c8cb81c8a192
Merge: 9976da9367 23f4a28f97
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Wed May 24 11:45:40 2023 -0400

    Merge branch 'tor-gitlab/mr/711'

 src/core/or/dos.c                 |   6 ++-
 src/ext/equix/hashx/src/context.c |   1 +
 src/feature/hs/hs_circuit.c       |   3 +-
 src/feature/hs/hs_dos.c           |   5 +-
 src/feature/hs/hs_intropoint.c    |   3 +-
 src/feature/hs/hs_service.c       |   3 +-
 src/lib/evloop/token_bucket.c     | 111 +++++++++++++++++++-------------------
 src/lib/evloop/token_bucket.h     |  12 ++---
 src/lib/time/compat_time.c        |  17 ++++++
 src/lib/time/compat_time.h        |  16 +++++-
 src/test/test_bwmgt.c             |  24 ++++++++-
 src/test/test_crypto.c            |   9 ++--
 src/test/test_dos.c               |  15 ++++--
 src/test/test_hs_dos.c            |  18 ++++---
 src/test/test_hs_intropoint.c     |   3 +-
 15 files changed, 160 insertions(+), 86 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.