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

[nickm at torproject.org]

commit bbc80ea042a124a5935bd4264677180efdcb2da2
Merge: 855cd533e e15a621ac
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 17 11:45:16 2020 -0400

    Merge branch 'maint-0.4.2' into maint-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(-)

diff --cc src/feature/hs/hs_client.c
index 222261e60,9d67f7127..af8cb0b41
--- a/src/feature/hs/hs_client.c
+++ b/src/feature/hs/hs_client.c
@@@ -1870,9 -1296,9 +1870,9 @@@ hs_client_decode_descriptor(const char 
  
    /* Parse descriptor */
    ret = hs_desc_decode_descriptor(desc_str, subcredential,
-                                   client_auht_sk, desc);
+                                   client_auth_sk, desc);
    memwipe(subcredential, 0, sizeof(subcredential));
 -  if (ret < 0) {
 +  if (ret != HS_DESC_DECODE_OK) {
      goto err;
    }