[tor-commits] [tor/master] Revert "Disallow reject6 and accept6 lines in descriptors"

[nickm at torproject.org]

commit 3da0837b0b114bb320a244679325d25d664752c1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Mar 6 13:26:38 2011 -0500

    Revert "Disallow reject6 and accept6 lines in descriptors"
    
    This reverts commit b3918b3bbbfa9097246d63746c8b540eff2ec8e8.
---
 src/or/routerparse.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index d76b006..aa0687d 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 ),