commit c3741d754eed8848b3009f728cb8d33d75c86549 Merge: 4dfada509a a3cef41fc3 Author: David Goulet dgoulet@torproject.org Date: Wed Feb 3 08:56:38 2021 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

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