]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1d4399 f470b86)
Merge branch 'maint-0.4.2'
authorNick Mathewson <nickm@torproject.org>
Thu, 30 Jan 2020 00:44:34 +0000 (19:44 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 30 Jan 2020 00:44:34 +0000 (19:44 -0500)
Use "-s ours" to avoid version bump.


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