]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21c3488 7660a7c)
Merge branch 'maint-0.2.9' into maint-0.3.5
authorteor <teor@torproject.org>
Tue, 22 Oct 2019 22:24:30 +0000 (08:24 +1000)
committerteor <teor@torproject.org>
Tue, 22 Oct 2019 22:25:42 +0000 (08:25 +1000)
`git merge --strategy ours` to take the 0.3.5 changes for 31001,
and ignore the conflicting 0.2.9 changes.


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