summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-02-15 08:19:44 -0500
committerNick Mathewson <nickm@torproject.org>2017-02-15 08:19:44 -0500
commit2e334d90a655a1047a9caf5ecadd9f0065f2eaab (patch)
tree3bdb8a0792b7f5cbc3e498fd03556b89af3b9dc9
parentff649ec2d91e9471c9cd9d13132922fe270ab7d9 (diff)
parentfea93abecd14b1e95a0bdd894183a81e2c284434 (diff)
downloadtor-2e334d90a655a1047a9caf5ecadd9f0065f2eaab.tar.gz
tor-2e334d90a655a1047a9caf5ecadd9f0065f2eaab.zip
Merge branch 'maint-0.2.9' into release-0.2.9
-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 c325412e39..7d9769b499 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -5621,7 +5621,7 @@ tor_version_parse(const char *s, tor_version_t *out)
#define NUMBER(m) \
do { \
- out->m = (int)tor_parse_uint64(val, 10, 0, INT32_MAX, &ok, &eos); \
+ out->m = (int)tor_parse_uint64(cp, 10, 0, INT32_MAX, &ok, &eos); \
if (!ok) \
return -1; \
if (!eos || eos == cp) \