aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-08-03 11:23:06 -0400
committerNick Mathewson <nickm@torproject.org>2012-08-03 11:23:06 -0400
commitbabf8e2a859f56befa9a9f8da6697a954ce53f7c (patch)
tree40f756a3d35f8323808166fbff825df41f82d583 /src
parentb50eb14bbf4da25ef43efe91851b239a04383c8e (diff)
parent1040afb2425a8056dc41b35e6d825fc329663ee6 (diff)
downloadtor-babf8e2a859f56befa9a9f8da6697a954ce53f7c.tar
tor-babf8e2a859f56befa9a9f8da6697a954ce53f7c.tar.gz
Merge remote-tracking branch 'origin/maint-0.2.3'
Diffstat (limited to 'src')
-rw-r--r--src/or/routerparse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 4231a17c6..970353a43 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -2853,7 +2853,7 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out,
int flavor = networkstatus_parse_flavor_name(tok->args[1]);
if (flavor < 0) {
log_warn(LD_DIR, "Can't parse document with unknown flavor %s",
- escaped(tok->args[2]));
+ escaped(tok->args[1]));
goto err;
}
ns->flavor = flav = flavor;