nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'sysrqb/bug12573'

Browse Source
This commit is contained in:
Nick Mathewson 2014-07-16 15:38:10 +02:00
commit f74a932e0b
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug12573 Normal file
View File

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

2
src/or/dirserv.c
View File

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