Merge branch 'maint-0.2.8'

src/test/test_config.c

@@ -1630,10 +1630,10 @@ test_config_adding_default_trusted_dir_servers(void *arg)
   tt_assert(get_n_authorities(BRIDGE_DIRINFO) == 1);
   tt_assert(smartlist_len(router_get_fallback_dir_servers()) == 1);
 
-  /* Assume we have nine V3 authorities */
+  /* Assume we have eight V3 authorities */
   add_default_trusted_dir_authorities(V3_DIRINFO);
-  tt_assert(get_n_authorities(V3_DIRINFO) == 9);
-  tt_assert(smartlist_len(router_get_fallback_dir_servers()) == 10);
+  tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 8);
+  tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 9);
 
  done:
   clear_dir_servers();