]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.3.2' into maint-0.3.3
authorNick Mathewson <nickm@torproject.org>
Wed, 9 May 2018 15:53:18 +0000 (11:53 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 9 May 2018 15:53:18 +0000 (11:53 -0400)
1  2 
src/or/hs_service.c
src/or/rendservice.c

Simple merge
Simple merge