]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/935'
authorNick Mathewson <nickm@torproject.org>
Tue, 23 Apr 2019 18:11:04 +0000 (14:11 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 23 Apr 2019 18:11:04 +0000 (14:11 -0400)
1  2 
src/feature/hs/hs_client.c

Simple merge