]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/294'
authorNick Mathewson <nickm@torproject.org>
Thu, 6 Sep 2018 13:47:32 +0000 (09:47 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 6 Sep 2018 13:47:32 +0000 (09:47 -0400)
1  2 
doc/tor.1.txt
src/feature/rend/rendservice.c
src/test/test_controller.c

diff --cc doc/tor.1.txt
Simple merge
Simple merge
Simple merge