[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/230'

Wed Dec 16 20:56:06 UTC 2020

commit 0bd4cd8101422e0f3604cdf80e28ec4e8ac67877
Merge: 66597b9291 6c602026e8
Author: Alexander FÃ¦rÃ¸y <ahf at torproject.org>
Date:   Wed Dec 16 20:55:03 2020 +0000

    Merge remote-tracking branch 'tor-gitlab/mr/230'

 changes/ticket40017_redux   | 3 +++
 src/core/or/connection_or.c | 5 +++++
 2 files changed, 8 insertions(+)