]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 49cffee 7afb95d)
Merge branch 'maint-0.4.1' into maint-0.4.2
authorNick Mathewson <nickm@torproject.org>
Thu, 30 Jan 2020 16:19:23 +0000 (11:19 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 30 Jan 2020 16:19:23 +0000 (11:19 -0500)
Using "ours" strategy to avoid version bump


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