]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'feature22976_squashed'
authorNick Mathewson <nickm@torproject.org>
Thu, 24 Aug 2017 13:23:43 +0000 (09:23 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 24 Aug 2017 13:23:43 +0000 (09:23 -0400)
1  2 
doc/tor.1.txt
src/or/main.c

diff --cc doc/tor.1.txt
Simple merge
diff --cc src/or/main.c
Simple merge