[tor-commits] [tor/master] Merge remote-tracking branch 'ahf/bugs/21757'

[nickm at torproject.org]

commit 10888dcac6cd1b32914da4d25c5dcc42e91a6239
Merge: 1bf891c a28be68
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 27 15:02:48 2017 +0200

    Merge remote-tracking branch 'ahf/bugs/21757'

 src/common/util.c    |  2 +-
 src/test/test_util.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)