commit 86bbd6eca3c0b4edfd1bbf298cea6775849c9a29 Merge: e150e1af7 bbc80ea04 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Mar 17 11:45:16 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 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(-)