[tor-commits] [tor/master] Merge branch 'ticket32845_squashed'

[nickm at torproject.org]

commit e231cd5b61afcb6640a7e17506bf33ddc6b1d2fe
Merge: 17a1ae025 1fd27155d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 7 10:16:15 2020 -0500

    Merge branch 'ticket32845_squashed'

 changes/ticket32845          |  4 ++++
 src/lib/string/util_string.c | 21 +++++++++++++++++++--
 src/test/test_util.c         | 35 ++++++++++++++++++++++++++++++++++-
 3 files changed, 57 insertions(+), 3 deletions(-)