[tor-commits] [tor/master] Merge branch 'tor-gitlab/mr/129'

[dgoulet at torproject.org]

commit a47d12c64d51edf702d7beaefb1f8ca97e8dd0f5
Merge: 7eef9ced61 4e8cb410a7
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Sep 17 09:17:53 2020 -0400

    Merge branch 'tor-gitlab/mr/129'

 src/test/test_util.c | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)