commit 0d5b20d2aa80ae560990c469fc30e27a841a350e Merge: 75873c1a3 089e57d22 Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 17 11:45:16 2020 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

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(-)