]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b45048f 8bc65cd)
Merge branch 'maint-0.4.1' into maint-0.4.2
authorteor <teor@torproject.org>
Tue, 22 Oct 2019 23:59:07 +0000 (09:59 +1000)
committerteor <teor@torproject.org>
Tue, 22 Oct 2019 23:59:07 +0000 (09:59 +1000)
`git merge --strategy ours` to use STATIC for unit tests in
maint-0.4.2.


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