diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-07-16 15:38:10 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-07-16 15:38:10 +0200 |
| commit | f74a932e0b68205b180c6894b036ab3193144390 (patch) | |
| tree | cb35cd401f40491efeddf2f6345f5d0d8e6bad6d | |
| parent | e669e910f46820350a31826368868bfd4b913e70 (diff) | |
| parent | 43bba9541af26ababa4854fa960ffe0e37d920e9 (diff) | |
| download | tor-f74a932e0b68205b180c6894b036ab3193144390.tar.gz tor-f74a932e0b68205b180c6894b036ab3193144390.zip | |
Merge remote-tracking branch 'sysrqb/bug12573'
| -rw-r--r-- | changes/bug12573 | 5 | ||||
| -rw-r--r-- | src/or/dirserv.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug12573 b/changes/bug12573 new file mode 100644 index 0000000000..46e3ee2fa0 --- /dev/null +++ b/changes/bug12573 @@ -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 diff --git a/src/or/dirserv.c b/src/or/dirserv.c index aedd092522..a033f8be6d 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1468,7 +1468,7 @@ dirserv_thinks_router_is_hs_dir(const routerinfo_t *router, * to fix the bug was 0.2.2.25-alpha. */ return (router->wants_to_be_hs_dir && router->dir_port && uptime >= get_options()->MinUptimeHidServDirectoryV2 && - node->is_running); + router_is_active(router, node, now)); } /** Don't consider routers with less bandwidth than this when computing |