commit 412b665d5f2511eaa914c9dad46012596817950e Merge: 995a3d5e17 ed6a328297 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 7 08:03:52 2020 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

changes/parallel_unit_test | 4 ++++ src/test/include.am | 22 +++++++++++++++++++--- src/test/testing_common.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/test/unittest_part1.sh | 3 +++ src/test/unittest_part2.sh | 3 +++ src/test/unittest_part3.sh | 3 +++ src/test/unittest_part4.sh | 3 +++ src/test/unittest_part5.sh | 3 +++ src/test/unittest_part6.sh | 3 +++ src/test/unittest_part7.sh | 3 +++ src/test/unittest_part8.sh | 3 +++ 11 files changed, 89 insertions(+), 3 deletions(-)