]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d4ff91 d47c52b)
Merge branch 'maint-0.2.8' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Thu, 8 Dec 2016 16:03:08 +0000 (11:03 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 8 Dec 2016 16:03:08 +0000 (11:03 -0500)
"Ours" merge to avoid bumping version.


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