]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 59819b2 f6efb3a)
Merge branch 'maint-0.4.3'
authorteor <teor@torproject.org>
Thu, 9 Apr 2020 01:06:51 +0000 (11:06 +1000)
committerteor <teor@torproject.org>
Thu, 9 Apr 2020 01:06:51 +0000 (11:06 +1000)
"ours" merge, to avoid taking PR 1854, which reverts
"Prefer IPv6 by default"  for 0.4.3 only.


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