]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4179615 0223057)
Merge branch 'maint-0.3.5' into maint-0.4.4
authorNick Mathewson <nickm@torproject.org>
Fri, 12 Mar 2021 16:36:34 +0000 (11:36 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 12 Mar 2021 16:36:34 +0000 (11:36 -0500)
1  2 
LICENSE patch | diff1 | diff2 | blob | history

diff --cc LICENSE
Simple merge
Mirror of https://git.torproject.org/tor.git