Merge remote-tracking branch 'sysrqb/bug12573'

changes/bug12573

@@ -0,0 +1,5 @@
+  o Major bugfixes:
+    - Relays should not be assigned the HSDir flag if they are
+      considered invalid. Also, do not assign the HSDir flag to relays
+      that are currently hibernating. Fixes #12573. Bugfix on
+      tor-0.2.0.10-alpha

src/or/dirserv.c

@@ -1468,7 +1468,7 @@ dirserv_thinks_router_is_hs_dir(const routerinfo_t *router,
    * to fix the bug was 0.2.2.25-alpha. */
   return (router->wants_to_be_hs_dir && router->dir_port &&
           uptime >= get_options()->MinUptimeHidServDirectoryV2 &&
-          node->is_running);
+          router_is_active(router, node, now));
 }
 
 /** Don't consider routers with less bandwidth than this when computing