[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2

[nickm at torproject.org]

commit e15a621ac81c472f69a082180fa9b4ed39274e43
Merge: 9ef8f5d1b 5f4e14b8c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 17 11:45:16 2020 -0400

    Merge branch 'maint-0.4.1' into maint-0.4.2

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