[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.4

[nickm@xxxxxxxxxxxxxx]

commit 0ae9fd62fdc5ffd41bf5bbf2f4a3c1e2a151fa2d
Merge: 014345ed6a f57b5c48e0
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Jun 10 12:30:11 2021 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.4

 changes/bug40392               | 4 ++++
 src/feature/hs/hs_descriptor.c | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

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
  };



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits