]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: add0004 569b4e5)
Merge branch 'maint-0.3.3'
authorNick Mathewson <nickm@torproject.org>
Tue, 22 May 2018 16:33:09 +0000 (12:33 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 May 2018 16:33:09 +0000 (12:33 -0400)
"Ours" merge to avoid the maint-0.3.3 version of the TROVE-2018-005
fix, which touches the files in their old locations.


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