]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a52a5e0 763fd0a)
Merge commit '763fd0ad66' into maint-0.4.0
authorteor <teor@torproject.org>
Thu, 5 Sep 2019 01:42:26 +0000 (11:42 +1000)
committerteor <teor@torproject.org>
Thu, 5 Sep 2019 01:42:26 +0000 (11:42 +1000)
tor-github/pr/1174, but with the last commit re-worded to remove
the fixup, because fixups break our push rules.


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