commit dec11793ba2fdaeb975e1566b68846431fb85110 Merge: 75741c6b3 8ab9f9399 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jan 14 12:42:19 2020 -0500 Merge branch 'ticket32825_squashed' changes/bug32825 | 4 ++++ src/test/test_util.c | 27 +++++++++++++++++---------- 2 files changed, 21 insertions(+), 10 deletions(-)