[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

[dgoulet@xxxxxxxxxxxxxx]

commit 5db8bffa4315a6c71ed20da01ff9e4634aa3ff96
Merge: de6644bcba 1bdccc03a9
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date:   Thu Jan 28 12:14:10 2021 -0500

    Merge branch 'maint-0.3.5' into release-0.3.5

 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                  |  7 ++++--
 src/feature/hs_common/shared_random_client.c | 23 ++++++++++++------
 src/feature/nodelist/nodelist.c              |  2 +-
 src/test/test_hs_cache.c                     |  7 +++---
 src/test/test_hs_client.c                    | 36 +++++++++++++++-------------
 src/test/test_hs_common.c                    | 36 ++++++++++++++++++----------
 src/test/test_hs_service.c                   | 21 ++++++++--------
 src/test/test_shared_random.c                | 22 +++++++++++++----
 13 files changed, 122 insertions(+), 65 deletions(-)

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