]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/first-hop-no-private'
authorNick Mathewson <nickm@torproject.org>
Wed, 9 Dec 2015 15:47:59 +0000 (10:47 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 9 Dec 2015 15:47:59 +0000 (10:47 -0500)
1  2 
doc/tor.1.txt

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