summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-12-05 11:56:03 -0500
committerNick Mathewson <nickm@torproject.org>2011-12-05 11:56:03 -0500
commit4f47db328048f4a59549ccda534c8d3f74f655aa (patch)
treecfdfe0134d4ba68daf78e02b0409f57f75a38d12 /src
parent15d99fe4eb0e969322f401bc5d5b497d5cfc9f71 (diff)
parent60c330a2515494a88aaae948e0e1ddfac3e8c904 (diff)
downloadtor-4f47db328048f4a59549ccda534c8d3f74f655aa.tar.gz
tor-4f47db328048f4a59549ccda534c8d3f74f655aa.zip
Merge remote-tracking branch 'sebastian/coverity'
Diffstat (limited to 'src')
-rw-r--r--src/or/directory.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index d4abe0243b..12636bac33 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -410,7 +410,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose,
} else {
/* Otherwise it might be a consensus we don't parse, but which we
* do cache. Look at the cached copy, perhaps. */
- cached_dir_t *cd = dirserv_get_consensus(resource ? resource : "ns");
+ cached_dir_t *cd = dirserv_get_consensus(resource);
if (cd)
if_modified_since = cd->published + 180;
}