Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

Conflicts:
	src/or/policies.c

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

@@ -888,6 +888,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;