commit b0bab82790836e3456d946e5a16298508b740ae2 Merge: 99618a9 44f6be4 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 7 13:30:55 2012 -0400

Merge remote-tracking branch 'arma/bug3886'

Conflicts: src/or/dirserv.c

changes/bug3886 | 5 +++++ src/or/dirserv.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)

diff --cc src/or/dirserv.c index ef6c35e,00b8205..67b18fb --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@@ -1855,8 -1821,8 +1855,8 @@@ dirserv_thinks_router_is_hs_dir(const r * *clients* suffering from bug 2722 are obsolete. The first version * to fix the bug was 0.2.2.25-alpha. */ return (router->wants_to_be_hs_dir && router->dir_port && - uptime > get_options()->MinUptimeHidServDirectoryV2 && + uptime >= get_options()->MinUptimeHidServDirectoryV2 && - router->is_running); + node->is_running); }

/** Look through the routerlist, the Mean Time Between Failure history, and