aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug158504
-rw-r--r--src/or/dirserv.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug15850 b/changes/bug15850
new file mode 100644
index 0000000000..48a7c7bdd7
--- /dev/null
+++ b/changes/bug15850
@@ -0,0 +1,4 @@
+ o Major bugfix
+ - Revert commit that made directory authority assign the HSDir flag to
+ relay without a DirPort which is bad because relay can't handle
+ BEGIN_DIR cells. Fixes #15850. Bugfix on tor-0.2.6.3-alpha;
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index e5a5b54303..a024be8342 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1305,7 +1305,7 @@ dirserv_thinks_router_is_hs_dir(const routerinfo_t *router,
else
uptime = real_uptime(router, now);
- return (router->wants_to_be_hs_dir &&
+ return (router->wants_to_be_hs_dir && router->dir_port &&
uptime >= get_options()->MinUptimeHidServDirectoryV2 &&
router_is_active(router, node, now));
}