aboutsummaryrefslogtreecommitdiff
path: root/src/or/routerparse.c
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2008-04-24 15:39:14 +0000
committerPeter Palfrader <peter@palfrader.org>2008-04-24 15:39:14 +0000
commit016e67f9415530399cdffec3d8d6530b3323dbbb (patch)
tree5a9dc1307a09a7bc8d2d7986e52a3141518079b8 /src/or/routerparse.c
parenteaad3ab395c8da0cc5c8cbe3e51109f181891216 (diff)
downloadtor-016e67f9415530399cdffec3d8d6530b3323dbbb.tar.gz
tor-016e67f9415530399cdffec3d8d6530b3323dbbb.zip
Merge conditional consensus downloading
svn:r14451
Diffstat (limited to 'src/or/routerparse.c')
-rw-r--r--src/or/routerparse.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 016b938ae9..7ff6c63112 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -1828,7 +1828,6 @@ routerstatus_parse_entry_from_string(memarea_t *area,
if (strcmpstart(tok->args[0], "Tor ")) {
rs->version_supports_begindir = 1;
rs->version_supports_extrainfo_upload = 1;
- rs->version_supports_conditional_consensus = 1;
} else {
rs->version_supports_begindir =
tor_version_as_new_as(tok->args[0], "0.2.0.1-alpha");
@@ -1836,8 +1835,6 @@ routerstatus_parse_entry_from_string(memarea_t *area,
tor_version_as_new_as(tok->args[0], "0.2.0.0-alpha-dev (r10070)");
rs->version_supports_v3_dir =
tor_version_as_new_as(tok->args[0], "0.2.0.8-alpha");
- rs->version_supports_conditional_consensus =
- tor_version_as_new_as(tok->args[0], "0.2.1.1-alpha");
}
if (vote_rs) {
vote_rs->version = tor_strdup(tok->args[0]);