]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1255' into maint-0.4.1
authorDavid Goulet <dgoulet@torproject.org>
Thu, 29 Aug 2019 12:55:27 +0000 (08:55 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Thu, 29 Aug 2019 12:55:27 +0000 (08:55 -0400)
1  2 
src/feature/rend/rendservice.c

Simple merge