[tor-commits] [tor/release-0.4.5] Merge branch 'tor-gitlab/mr/203' into maint-0.4.5

[dgoulet at torproject.org]

commit 07006785fd47e6ce3303659a03004e133d204cc2
Merge: d04a27bed2 ffa7b15950
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Nov 17 12:25:48 2020 -0500

    Merge branch 'tor-gitlab/mr/203' into maint-0.4.5

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