[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2

[nickm at torproject.org]

commit 1f54007161cc8d315e7733d5d8cb2699d9f849fd
Merge: 529b989675 352991c843
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 6 13:24:11 2020 -0400

    Merge branch 'maint-0.4.2' into release-0.4.2

 .gitlab-ci.yml | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)