Commit 7286a27c authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote-tracking branch 'origin/maint-0.2.6'

parents 6ed57331 26c344a5

changes/bug15850

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  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;

src/or/dirserv.c

+1 −1
Original line number Diff line number Diff line
@@ -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));

}