]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 537be1d 489d33e)
Merge branch 'maint-0.4.3' into maint-0.4.4
authorNick Mathewson <nickm@torproject.org>
Wed, 12 Aug 2020 12:40:10 +0000 (08:40 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 12 Aug 2020 12:40:10 +0000 (08:40 -0400)
"ours" merge to avoid MR 122 -- we already merged MR 123.


Trivial merge
Mirror of https://git.torproject.org/tor.git