]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a762234 b1a571f)
Merge remote-tracking branch 'tor-github/pr/1739'
authorteor <teor@torproject.org>
Fri, 3 Apr 2020 11:59:19 +0000 (21:59 +1000)
committerteor <teor@torproject.org>
Fri, 3 Apr 2020 11:59:19 +0000 (21:59 +1000)
Ignored conflicting style changes: they will be re-applied in
the next commit.


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