[tor-commits] [tor/master] Merge branch 'ticket40237_044_01' into ticket40237_045_01

[asn@xxxxxxxxxxxxxx]

commit 9b59ede8d342a11d7949a4793b7d456de2a3ff5d
Merge: d1f4741606 b3652f2104
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date:   Tue Jan 12 10:55:21 2021 -0500

    Merge branch 'ticket40237_044_01' into ticket40237_045_01

 changes/ticket40237                          |  5 +++
 src/core/mainloop/mainloop.c                 |  3 +-
 src/feature/hs/hs_cache.c                    |  5 ++-
 src/feature/hs/hs_client.c                   |  8 +++--
 src/feature/hs/hs_common.c                   | 12 ++++++--
 src/feature/hs/hs_service.c                  |  9 ++++--
 src/feature/hs_common/shared_random_client.c | 26 ++++++++++------
 src/feature/nodelist/nodelist.c              |  2 +-
 src/test/test_hs_cache.c                     | 19 ++++++------
 src/test/test_hs_client.c                    | 46 +++++++++++++++-------------
 src/test/test_hs_common.c                    | 36 ++++++++++++++--------
 src/test/test_hs_service.c                   | 40 ++++++++++++------------
 src/test/test_shared_random.c                | 22 ++++++++++---
 13 files changed, 144 insertions(+), 89 deletions(-)




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits