]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1456'
authorGeorge Kadianakis <desnacked@riseup.net>
Tue, 29 Oct 2019 13:29:13 +0000 (21:29 +0800)
committerGeorge Kadianakis <desnacked@riseup.net>
Tue, 29 Oct 2019 13:29:13 +0000 (21:29 +0800)
1  2 
src/feature/hs/hs_service.c

Simple merge