]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0e18d2 15e752e)
Merge branch 'maint-0.3.4' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Thu, 15 Nov 2018 21:55:42 +0000 (16:55 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 15 Nov 2018 21:55:42 +0000 (16:55 -0500)
"ours" merge to avoid duplicating conflict resolution in merge of 24104


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