diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-01-19 14:51:39 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-01-19 14:51:39 -0500 |
| commit | 37ca182c7e2b3db60b499cc9c3c13d1843f657eb (patch) | |
| tree | 2b016623d58f708ad4b9d77ec71af45ad5937279 /src/or/directory.c | |
| parent | 4728bd904f2b64fe183a068e5fb1be00ee5e6008 (diff) | |
| parent | f43f87db5b945ea86cfb2bce316b46eb6fd9affd (diff) | |
| download | tor-37ca182c7e2b3db60b499cc9c3c13d1843f657eb.tar.gz tor-37ca182c7e2b3db60b499cc9c3c13d1843f657eb.zip | |
Merge branch 'maint-0.2.1' into master
Conflicts:
ChangeLog
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
Diffstat (limited to 'src/or/directory.c')
| -rw-r--r-- | src/or/directory.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 124c64684e..30c08b84b2 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3011,7 +3011,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, if (!strcmp(url,"/tor/dbg-stability.txt")) { const char *stability; size_t len; - if (! authdir_mode_tests_reachability(options) || + if (options->BridgeAuthoritativeDir || + ! authdir_mode_tests_reachability(options) || ! (stability = rep_hist_get_router_stability_doc(time(NULL)))) { write_http_status_line(conn, 404, "Not found."); goto done; |