mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nick Mathewson 2015-04-28 14:46:53 -04:00
commit 7286a27cfc
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug15850 Normal file
View File

@ -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;

2
src/or/dirserv.c
View File

@ -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));
}