]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de31c47 ff52205)
Merge branch 'maint-0.4.2' into maint-0.4.3
authorteor <teor@torproject.org>
Wed, 12 Feb 2020 04:13:15 +0000 (14:13 +1000)
committerteor <teor@torproject.org>
Wed, 12 Feb 2020 04:13:15 +0000 (14:13 +1000)
"ours" merge, because simiar BridgeDistribution fixes have already
been merged to maint-0.4.3. (See 32753.)

The stem changes in 33075 have already been merged to maint-0.4.3,
so this "ours" merge does not affect them.


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