]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'asn/bug23346'
authorNick Mathewson <nickm@torproject.org>
Mon, 4 Sep 2017 16:30:51 +0000 (12:30 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 4 Sep 2017 16:30:51 +0000 (12:30 -0400)
1  2 
src/or/hs_service.c
src/or/hs_service.h

Simple merge
Simple merge