commit a3cef41fc375b3a004eca3d090be0ebe9801cdb0 Merge: c2cee6c780 59f1a41a7f Author: David Goulet dgoulet@torproject.org Date: Wed Feb 3 08:56:30 2021 -0500

Merge branch 'ticket40270_035_01' into maint-0.3.5

src/core/or/connection_edge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)