]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'dormant_v2_squashed'
authorNick Mathewson <nickm@torproject.org>
Mon, 26 Nov 2018 21:33:31 +0000 (16:33 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 26 Nov 2018 21:33:31 +0000 (16:33 -0500)
1  2 
doc/tor.1.txt
src/feature/control/control.c

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