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

[nickm at torproject.org]

commit 05ee5b983c679527a0998458706dbdd11f891198
Merge: e85f517831 faf7b550e7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 19 12:53:52 2021 -0500

    Merge branch 'maint-0.3.5' into release-0.3.5

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