]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.4.2
authorteor <teor@torproject.org>
Thu, 24 Oct 2019 23:41:48 +0000 (09:41 +1000)
committerteor <teor@torproject.org>
Thu, 24 Oct 2019 23:41:48 +0000 (09:41 +1000)
1  2 
src/feature/hs/hs_client.c

Simple merge