From: Nick Mathewson Date: Sun, 6 Mar 2011 18:26:38 +0000 (-0500) Subject: Revert "Disallow reject6 and accept6 lines in descriptors" X-Git-Tag: tor-0.2.2.23-alpha~6^2^2^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3da0837b0b114bb320a244679325d25d664752c1;p=thirdparty%2Ftor.git Revert "Disallow reject6 and accept6 lines in descriptors" This reverts commit b3918b3bbbfa9097246d63746c8b540eff2ec8e8. --- diff --git a/src/or/routerparse.c b/src/or/routerparse.c index d76b00698f..aa0687d883 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -222,6 +222,8 @@ typedef struct token_rule_t { static token_rule_t routerdesc_token_table[] = { T0N("reject", K_REJECT, ARGS, NO_OBJ ), T0N("accept", K_ACCEPT, ARGS, NO_OBJ ), + T0N("reject6", K_REJECT6, ARGS, NO_OBJ ), + T0N("accept6", K_ACCEPT6, ARGS, NO_OBJ ), T1_START( "router", K_ROUTER, GE(5), NO_OBJ ), T1( "signing-key", K_SIGNING_KEY, NO_ARGS, NEED_KEY_1024 ), T1( "onion-key", K_ONION_KEY, NO_ARGS, NEED_KEY_1024 ),