From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 10 Jun 2021 16:30:11 +0000 (-0400)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.4
X-Git-Tag: tor-0.4.4.9~3^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ae9fd62fdc5ffd41bf5bbf2f4a3c1e2a151fa2d;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5' into maint-0.4.4
---

0ae9fd62fdc5ffd41bf5bbf2f4a3c1e2a151fa2d
diff --cc src/feature/hs/hs_descriptor.c
index 50a46fb40f,f74bb97ee2..c1e6553398
--- a/src/feature/hs/hs_descriptor.c
+++ b/src/feature/hs/hs_descriptor.c
@@@ -133,10 -132,10 +133,10 @@@ static token_rule_t hs_desc_superencryp
    END_OF_TABLE
  };
  
 -/* Descriptor ruleset for the encrypted section. */
 +/** Descriptor ruleset for the encrypted section. */
  static token_rule_t hs_desc_encrypted_v3_token_table[] = {
    T1_START(str_create2_formats, R3_CREATE2_FORMATS, CONCAT_ARGS, NO_OBJ),
-   T01(str_intro_auth_required, R3_INTRO_AUTH_REQUIRED, ARGS, NO_OBJ),
+   T01(str_intro_auth_required, R3_INTRO_AUTH_REQUIRED, GE(1), NO_OBJ),
    T01(str_single_onion, R3_SINGLE_ONION_SERVICE, ARGS, NO_OBJ),
    END_OF_TABLE
  };