]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91c7d39 4ecd09c)
Merge branch 'maint-0.4.1'
authorNick Mathewson <nickm@torproject.org>
Wed, 19 Jun 2019 18:29:22 +0000 (14:29 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 19 Jun 2019 18:29:22 +0000 (14:29 -0400)
"ours" merge to avoid taking pracktracker removal.


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