commit bca30bcb90a7c01eea453b1fdf2b6ba368500e03 Merge: ca1f18c15 2420c8c93 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Oct 2 19:19:11 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1374' changes/bug31897 | 3 +++ src/test/test_util.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-)