]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'ticket23820_032_01_squashed' into maint-0.3.2
authorNick Mathewson <nickm@torproject.org>
Thu, 2 Nov 2017 14:19:29 +0000 (10:19 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 2 Nov 2017 14:19:29 +0000 (10:19 -0400)
1  2 
src/or/hs_client.c
src/or/hs_service.c

Simple merge
Simple merge