]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c64cfe 9b7cdd2)
Merge remote-tracking branch 'tor-github/pr/741'
authorNick Mathewson <nickm@torproject.org>
Thu, 11 Apr 2019 18:27:06 +0000 (14:27 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 11 Apr 2019 18:27:06 +0000 (14:27 -0400)
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