]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c81901f 86f880d)
Merge remote-tracking branch 'tor-gitlab/mr/432' into main
authorAlexander Færøy <ahf@torproject.org>
Thu, 14 Oct 2021 13:03:03 +0000 (13:03 +0000)
committerAlexander Færøy <ahf@torproject.org>
Thu, 14 Oct 2021 13:03:03 +0000 (13:03 +0000)
1  2 
doc/man/tor.1.txt patch | diff1 | diff2 | blob | history

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