[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1338'

[nickm at torproject.org]

commit 7c3378fb8d37e1f22ae7f04012e3e57a16b7f2fc
Merge: 01af3a55f 42ba3997d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 11 12:20:14 2019 -0500

    Merge remote-tracking branch 'tor-github/pr/1338'

 changes/ticket30920          |  3 +++
 src/lib/confmgt/.may_include |  1 +
 src/lib/confmgt/unitparse.c  | 35 +++++++++++++++++++++++++++++++----
 src/lib/intmath/muldiv.c     | 14 ++++++++++++++
 src/lib/intmath/muldiv.h     |  2 ++
 src/test/test_confparse.c    | 17 ++++++++++++++---
 src/test/test_util.c         |  9 +++++++++
 7 files changed, 74 insertions(+), 7 deletions(-)