Merge branch 'maint-0.4.2' into maint-0.4.3

diff --cc src/feature/hs/hs_client.c
index 222261e6042aeab112d5d9d4de400ec65ea47b12,9d67f712750325c88382718322f462c33d76ba9a..af8cb0b41080d5362e92ddb089a6c02cffdae7f4
--- 1/src/feature/hs/hs_client.c
--- 2/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;
    }
  

diff --cc src/feature/hs/hs_service.c
Simple merge

diff --cc src/lib/crypt_ops/crypto_ed25519.c
Simple merge