Merge branch 'maint-0.2.9' into release-0.2.9

This commit is contained in:
Nick Mathewson 2017-02-15 08:19:44 -05:00
commit 2e334d90a6
1 changed files with 1 additions and 1 deletions

View File

@ -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) \