diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2011-03-06 18:25:44 +0100 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2011-03-06 18:25:44 +0100 |
| commit | 9f614507b6db75fff5491be4c6eeed07c2c3818d (patch) | |
| tree | 7d37d052ab9d00072e4ce50b8dce841ef3a40290 | |
| parent | 1d6af67ab8d96c30e022f1f7602276f10c8444dc (diff) | |
| parent | b3918b3bbbfa9097246d63746c8b540eff2ec8e8 (diff) | |
| download | tor-9f614507b6db75fff5491be4c6eeed07c2c3818d.tar.gz tor-9f614507b6db75fff5491be4c6eeed07c2c3818d.zip | |
Merge branch 'maint-0.2.1' into maint-0.2.2
| -rw-r--r-- | src/or/routerparse.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index db7161e3da..e034c6c9b8 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -267,8 +267,6 @@ 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 ), |