aboutsummaryrefslogtreecommitdiff
path: root/src/or/directory.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-10-26 20:15:03 -0400
committerNick Mathewson <nickm@torproject.org>2009-10-26 20:15:03 -0400
commit071521e02f1e5b966c86324dfadbbef52900707f (patch)
treea2bf3913bf0d4b58f379782538fc31432b048e63 /src/or/directory.c
parente0b2c84cde102b8202d47dccbde54245af03cb43 (diff)
parent56048637a5e34220d0a5c7abbef4eb56c9312f6c (diff)
downloadtor-071521e02f1e5b966c86324dfadbbef52900707f.tar
tor-071521e02f1e5b966c86324dfadbbef52900707f.tar.gz
Merge commit 'origin/maint-0.2.1'
Conflicts: ChangeLog
Diffstat (limited to 'src/or/directory.c')
-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 01647ceaa..e703bd438 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -333,7 +333,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose,
return;
}
- if (DIR_PURPOSE_FETCH_CONSENSUS) {
+ if (dir_purpose == DIR_PURPOSE_FETCH_CONSENSUS) {
networkstatus_t *v = networkstatus_get_latest_consensus();
if (v)
if_modified_since = v->valid_after + 180;