]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Mon, 29 Jun 2020 16:55:27 +0000 (12:55 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 29 Jun 2020 16:55:27 +0000 (12:55 -0400)
1  2 
src/feature/hs/hs_client.c

Simple merge