]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ea9d3f 8f44d28)
Merge branch 'maint-0.2.8'
authorNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2016 17:06:06 +0000 (13:06 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2016 17:06:06 +0000 (13:06 -0400)
This is an "ours" merge, to avoid messing with the version.


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