diff options
author | Nick Mathewson <nickm@torproject.org> | 2012-08-17 12:33:17 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2012-08-17 12:33:17 -0400 |
commit | 676f71054f11727fdfa8707979d8c6fe143c9333 (patch) | |
tree | 682020f063aad9523d69dd7bcea8126c6e46ee91 /src/or/directory.h | |
parent | a74d4182f106b1b89367cf1a640b1140d3d35d2c (diff) | |
parent | d993b0448508d910be0c26096fe710b13e8af4e7 (diff) | |
download | tor-676f71054f11727fdfa8707979d8c6fe143c9333.tar.gz tor-676f71054f11727fdfa8707979d8c6fe143c9333.zip |
Merge remote-tracking branch 'public/bug6507' into maint-0.2.3
Diffstat (limited to 'src/or/directory.h')
-rw-r--r-- | src/or/directory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/directory.h b/src/or/directory.h index 584fe84311..1ca1c5a6e0 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -80,7 +80,7 @@ time_t download_status_increment_failure(download_status_t *dls, * the optional status code <b>sc</b>. */ #define download_status_failed(dls, sc) \ download_status_increment_failure((dls), (sc), NULL, \ - get_options()->DirPort!=NULL, time(NULL)) + get_options()->DirPort_set, time(NULL)) void download_status_reset(download_status_t *dls); static int download_status_is_ready(download_status_t *dls, time_t now, |