]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 116970d 2460b44)
Merge branch 'maint-0.2.9' into maint-0.3.4
authorteor <teor@torproject.org>
Fri, 19 Apr 2019 01:59:18 +0000 (11:59 +1000)
committerteor <teor@torproject.org>
Fri, 19 Apr 2019 01:59:18 +0000 (11:59 +1000)
"ours" merge, to avoid taking any changes from PR 792 in 0.3.4.
(We already merged PR 791 for 29665 into 0.3.4.)


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