commit 6031aa45fa8cd3b7b5666ae5915b552db35c0734 Merge: 4f2257477 5f4e14b8c Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 17 11:45:16 2020 -0400

Merge branch 'maint-0.4.1' into release-0.4.1

changes/trove_2020_003 | 4 ++++ src/feature/hs/hs_client.c | 6 +++--- src/feature/hs/hs_service.c | 6 ++++++ src/lib/crypt_ops/crypto_ed25519.c | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-)