]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61fe3f4 a4790e7)
Merge branch 'maint-0.4.2'
authorNick Mathewson <nickm@torproject.org>
Fri, 11 Oct 2019 21:20:54 +0000 (17:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 11 Oct 2019 21:20:54 +0000 (17:20 -0400)
"Ours" merge to avoid takign ".enable_practracker_in_hooks"


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