]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ffd7207 e021f89)
Merge branch 'maint-0.3.4' into maint-0.3.5
authorteor <teor@torproject.org>
Wed, 13 Mar 2019 20:59:09 +0000 (06:59 +1000)
committerteor <teor@torproject.org>
Wed, 13 Mar 2019 20:59:09 +0000 (06:59 +1000)
"ours" merge to ignore the changes to src/common/compat.c,
they have already been merged to 0.3.5 in the correct file.


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