diff options
| author | Peter Palfrader <peter@palfrader.org> | 2008-04-24 15:43:25 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2008-04-24 15:43:25 +0000 |
| commit | ca430446002a5d940222979c45af22b86c70d356 (patch) | |
| tree | da45f1dc4af71b266543ee919b2e9e9e82504a15 /src/or/routerparse.c | |
| parent | 016e67f9415530399cdffec3d8d6530b3323dbbb (diff) | |
| download | tor-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/routerparse.c')
| -rw-r--r-- | src/or/routerparse.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 7ff6c63112..016b938ae9 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1828,6 +1828,7 @@ 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"); @@ -1835,6 +1836,8 @@ 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]); |