Merge remote branch 'origin/maint-0.2.2'

changes/ipv6_crash

@@ -0,0 +1,3 @@
+  o Major bugfixes (directory authority)
+    - Fix a crash in parsing router descriptors containing IPv6
+      addresses.  Bugfix on 0.2.1.3-alpha.

src/or/policies.c

@@ -901,6 +901,8 @@ exit_policy_is_general_exit_helper(smartlist_t *policy, int port)
 
   memset(subnet_status, 0, sizeof(subnet_status));
   SMARTLIST_FOREACH(policy, addr_policy_t *, p, {
+    if (tor_addr_family(&p->addr) != AF_INET)
+      continue; /* IPv4 only for now */
     if (p->prt_min > port || p->prt_max < port)
       continue; /* Doesn't cover our port. */
     mask = 0;

src/or/routerparse.c

@@ -266,8 +266,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 ),