]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1344'
authorDavid Goulet <dgoulet@torproject.org>
Wed, 2 Oct 2019 14:37:49 +0000 (10:37 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Wed, 2 Oct 2019 14:37:49 +0000 (10:37 -0400)
1  2 
src/core/or/connection_edge.c

Simple merge