All relays now store and serve v2 hidden service descriptors by default (not only directory mirrors).

svn:r16961

2 files changed, 2 insertions, 3 deletions

diff --git a/src/or/router.c b/src/or/router.c
index 18e8abcfe1..1132f9dca5 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1702,8 +1702,7 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router,
     onion_pkey, identity_pkey,
     family_line,
     we_are_hibernating() ? "opt hibernating 1\n" : "",
-    (options->DirPort && options->HidServDirectoryV2) ?
-        "opt hidden-service-dir\n" : "");
+    options->HidServDirectoryV2 ? "opt hidden-service-dir\n" : "");
 
   tor_free(family_line);
   tor_free(onion_pkey);
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 52abe85fc6..f39dbf9c62 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4959,7 +4959,7 @@ hid_serv_acting_as_directory(void)
   routerstatus_t *rs;
   if (!me)
     return 0;
-  if (!get_options()->DirPort || !get_options()->HidServDirectoryV2) {
+  if (!get_options()->HidServDirectoryV2) {
     log_info(LD_REND, "We are not acting as hidden service directory, "
                       "because we have not been configured as such.");
     return 0;