Merge remote-tracking branch 'asn/bug13064'

diff --cc src/or/dirserv.c
index 92d34e2df7880111d7799a76197e28a3ba4ad0a5,17a7ad962e9a2db19ff65d3904d183208e4ff29e..1139dc1713139f2fac9f9ab9af8e46eebad27a7b
--- 1/src/or/dirserv.c
--- 2/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@@ -2142,12 -2320,8 +2142,7 @@@ set_routerstatus_from_routerinfo(router
    } else {
      rs->is_possible_guard = 0;
    }
-   if (options->TestingTorNetwork &&
-       routerset_contains_routerstatus(options->TestingDirAuthVoteGuard,
-                                       rs, 0)) {
-     rs->is_possible_guard = 1;
-   }
  
 -  rs->is_bad_directory = listbaddirs && node->is_bad_directory;
    rs->is_bad_exit = listbadexits && node->is_bad_exit;
    node->is_hs_dir = dirserv_thinks_router_is_hs_dir(ri, node, now);
    rs->is_hs_dir = vote_on_hsdirs && node->is_hs_dir;