]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1563'
authorDavid Goulet <dgoulet@torproject.org>
Tue, 3 Dec 2019 14:22:21 +0000 (09:22 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Tue, 3 Dec 2019 14:22:21 +0000 (09:22 -0500)
1  2 
src/feature/hs/hs_client.c
src/feature/hs/hs_client.h

Simple merge
Simple merge