From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 7 Jun 2012 17:30:55 +0000 (-0400)
Subject: Merge remote-tracking branch 'arma/bug3886'
X-Git-Tag: tor-0.2.3.17-beta~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0bab82790836e3456d946e5a16298508b740ae2;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'arma/bug3886'

Conflicts:
	src/or/dirserv.c
---

b0bab82790836e3456d946e5a16298508b740ae2
diff --cc src/or/dirserv.c
index ef6c35e739,00b8205893..67b18fb523
--- 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