]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf2f36b cc34ba1)
Merge branch 'maint-0.2.8' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Mon, 5 Dec 2016 15:06:45 +0000 (10:06 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 5 Dec 2016 15:06:45 +0000 (10:06 -0500)

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