]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48e9903 ec213ae)
Merge branch 'maint-0.2.9' into maint-0.3.4
authorteor <teor@torproject.org>
Fri, 19 Apr 2019 01:39:17 +0000 (11:39 +1000)
committerteor <teor@torproject.org>
Fri, 19 Apr 2019 01:39:17 +0000 (11:39 +1000)
"ours" merge, to avoid taking any changes from PR 772 in 0.3.4.
(We already merged a different fix for 23790 into 0.3.2 and later.)


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