]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 955846f bcbb2d1)
Merge branch 'maint-0.2.9'
authorNick Mathewson <nickm@torproject.org>
Mon, 23 Jan 2017 00:04:02 +0000 (19:04 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 23 Jan 2017 00:04:02 +0000 (19:04 -0500)
"ours" merge to avoid taking cherry-picked 20307 fix


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