[tor-commits] [tor/master] Merge branch 'maint-0.4.5' into master

[dgoulet at torproject.org]

commit 0921fdf633f99cda0df3dab17e996d41dd596c9b
Merge: bc968097f2 07006785fd
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Nov 17 12:25:56 2020 -0500

    Merge branch 'maint-0.4.5' into master

 changes/bug40017            |  5 +++++
 src/core/or/connection_or.c | 28 +++++++++++++++-------------
 2 files changed, 20 insertions(+), 13 deletions(-)