From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 17 Mar 2020 15:45:16 +0000 (-0400)
Subject: Merge branch 'maint-0.4.2' into maint-0.4.3
X-Git-Tag: tor-0.4.3.3-alpha~9^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bbc80ea042a124a5935bd4264677180efdcb2da2;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.2' into maint-0.4.3
---

bbc80ea042a124a5935bd4264677180efdcb2da2
diff --cc src/feature/hs/hs_client.c
index 222261e604,9d67f71275..af8cb0b410
--- 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;
    }