]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 24318fb f62c74c)
Merge branch 'maint-0.2.8' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Mon, 19 Dec 2016 15:12:34 +0000 (10:12 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 19 Dec 2016 15:12:34 +0000 (10:12 -0500)
"Ours" merge to avoid version bump.


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