summaryrefslogtreecommitdiff
path: root/src/or/networkstatus.c
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2008-04-24 15:43:25 +0000
committerPeter Palfrader <peter@palfrader.org>2008-04-24 15:43:25 +0000
commitca430446002a5d940222979c45af22b86c70d356 (patch)
treeda45f1dc4af71b266543ee919b2e9e9e82504a15 /src/or/networkstatus.c
parent016e67f9415530399cdffec3d8d6530b3323dbbb (diff)
downloadtor-ca430446002a5d940222979c45af22b86c70d356.tar.gz
tor-ca430446002a5d940222979c45af22b86c70d356.zip
I bet I screwed up while merging in the changes from the feature branch into my git-svn repository. Undo r14451
svn:r14452
Diffstat (limited to 'src/or/networkstatus.c')
-rw-r--r--src/or/networkstatus.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 5ec72daf40..f56ffff19e 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1280,6 +1280,8 @@ routerstatus_has_changed(const routerstatus_t *a, const routerstatus_t *b)
a->version_supports_begindir != b->version_supports_begindir ||
a->version_supports_extrainfo_upload !=
b->version_supports_extrainfo_upload ||
+ a->version_supports_conditional_consensus !=
+ b->version_supports_conditional_consensus ||
a->version_supports_v3_dir != b->version_supports_v3_dir;
}