Merge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5
commit0c0214bcc08e85040e8eb12f8388a45d271a6918
authorNick Mathewson <nickm@torproject.org>
Mon, 29 Jun 2020 16:55:27 +0000 (29 12:55 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 29 Jun 2020 16:55:27 +0000 (29 12:55 -0400)
tree1a06f4de88fd37012165189ab85fb3ed228b5b17
parent6a43aadecc5ab8564e71da2f00483eb63df13ae0
parent88489cd29006f093e1a5572711b26ee1b057e359
Merge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5
src/feature/hs/hs_client.c