]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'dgoulet/bug27550_033_01' into maint-0.3.3
authorNick Mathewson <nickm@torproject.org>
Thu, 15 Nov 2018 21:37:02 +0000 (16:37 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 15 Nov 2018 21:37:02 +0000 (16:37 -0500)
1  2 
src/or/hs_client.c

Simple merge