]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d21e5cf 2b99350)
Merge branch 'maint-0.2.9' into maint-0.3.1
authorNick Mathewson <nickm@torproject.org>
Fri, 16 Feb 2018 13:47:12 +0000 (08:47 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 16 Feb 2018 13:47:12 +0000 (08:47 -0500)
"ours" merge to avoid conflicts with the cherry-picked fix for 24898.


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