[or-cvs] [tor/master] Only send the if_modified_since header for a v3 consensus.

[nickm@xxxxxxxx (Nick Mathewson)]

Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Mon, 26 Oct 2009 20:12:52 -0400
Subject: Only send the if_modified_since header for a v3 consensus.
Commit: 56048637a5e34220d0a5c7abbef4eb56c9312f6c

Spotted by xmux; bugfix on 0.2.0.10-alpha.
(Bug introduced by 20b10859)
---
 ChangeLog          |    8 ++++++++
 src/or/directory.c |    2 +-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e8ec768..2ea21b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Changes in Version 0.2.1.21 - 20??-??-??
+  o Minor bugfixes:
+    - Do not refuse to learn about authority certs and v2 networkstatus
+      documents that are older than the latest consensus.  This bug might
+      have degraded client bootstrapping.  Bugfix on 0.2.0.10-alpha.
+      Spotted and fixed by xmux.
+
+
 Changes in version 0.2.1.20 - 2009-10-15
   o Major bugfixes:
     - Send circuit or stream sendme cells when our window has decreased
diff --git a/src/or/directory.c b/src/or/directory.c
index 5b8637a..8099e33 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -332,7 +332,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;
-- 
1.5.6.5