]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4bb06ca bb3df5f)
Merge branch 'ticket33678_043' into ticket33678_master
authorteor <teor@torproject.org>
Fri, 20 Mar 2020 07:33:56 +0000 (17:33 +1000)
committerteor <teor@torproject.org>
Fri, 20 Mar 2020 07:33:56 +0000 (17:33 +1000)
Don't take the practracker disable changes from 0.4.3.


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