]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67cec75 f93bcab)
Merge branch 'maint-0.2.8' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Tue, 28 Feb 2017 15:38:31 +0000 (10:38 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 28 Feb 2017 15:38:31 +0000 (10:38 -0500)
This is an "ours" merge to avoid taking a version bump


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