]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a45398 810f7c5)
Merge remote-tracking branch 'jryans/doc-formatting'
authorNick Mathewson <nickm@torproject.org>
Mon, 2 Jan 2017 13:53:17 +0000 (08:53 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 2 Jan 2017 13:53:17 +0000 (08:53 -0500)
1  2 
doc/tor.1.txt patch | diff1 | diff2 | blob | history

diff --cc doc/tor.1.txt
Simple merge
Mirror of https://git.torproject.org/tor.git