Merge branch 'maint-0.2.9'

This commit is contained in:
Nick Mathewson 2017-02-15 08:19:51 -05:00
commit d633c4757c

View File

@ -4894,7 +4894,7 @@ tor_version_parse(const char *s, tor_version_t *out)
#define NUMBER(m) \ #define NUMBER(m) \
do { \ 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) \ if (!ok) \
return -1; \ return -1; \
if (!eos || eos == cp) \ if (!eos || eos == cp) \