]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17ceeb7 515ccc4)
Merge remote-tracking branches 'tor-gitlab/mr/439' and 'tor-gitlab/mr/441'
authorNick Mathewson <nickm@torproject.org>
Thu, 16 Sep 2021 12:53:28 +0000 (08:53 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 16 Sep 2021 12:53:28 +0000 (08:53 -0400)
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