]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'dgoulet/ticket27410_032_01' into maint-0.3.3
authorNick Mathewson <nickm@torproject.org>
Fri, 2 Nov 2018 13:04:20 +0000 (09:04 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 2 Nov 2018 13:04:20 +0000 (09:04 -0400)
1  2 
src/or/hs_client.c

Simple merge