diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-07 13:30:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-07 13:30:55 -0400 |
| commit | b0bab82790836e3456d946e5a16298508b740ae2 (patch) | |
| tree | 166373c156df984d7c1cb359ce372a308554313d | |
| parent | 99618a9641d02b7b99a79c71517203bb70043515 (diff) | |
| parent | 44f6be4681cd3fcdab0e1a6d892b8918373e12d3 (diff) | |
| download | tor-b0bab82790836e3456d946e5a16298508b740ae2.tar.gz tor-b0bab82790836e3456d946e5a16298508b740ae2.zip | |
Merge remote-tracking branch 'arma/bug3886'
Conflicts:
src/or/dirserv.c
| -rw-r--r-- | changes/bug3886 | 5 | ||||
| -rw-r--r-- | src/or/dirserv.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug3886 b/changes/bug3886 new file mode 100644 index 0000000000..691d4ef327 --- /dev/null +++ b/changes/bug3886 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix an edge case where TestingTorNetwork is set but the authorities + and relays all have an uptime of zero, where the private Tor network + could briefly lack support for hidden services. Fixes bug 3886; + bugfix on 0.2.2.18-alpha. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index ef6c35e739..67b18fb523 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1855,7 +1855,7 @@ dirserv_thinks_router_is_hs_dir(const routerinfo_t *router, * *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 && node->is_running); } |