[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/143' into maint-0.3.5

[nickm at torproject.org]

commit faf7b550e740642e060518adc6a8624b036ed8e2
Merge: 2d5b21598e 020e8e41c6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 19 12:53:30 2021 -0500

    Merge remote-tracking branch 'tor-gitlab/mr/143' into maint-0.3.5

 changes/bug40113           | 3 +++
 src/test/test_connection.c | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)