]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb281da cc5319b)
Merge branch 'tor-github/pr/1850'
authorGeorge Kadianakis <desnacked@riseup.net>
Thu, 21 May 2020 13:24:32 +0000 (16:24 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Thu, 21 May 2020 13:24:32 +0000 (16:24 +0300)
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