]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02383ea f258064)
Merge branch 'maint-0.2.8'
authorNick Mathewson <nickm@torproject.org>
Fri, 27 May 2016 01:09:22 +0000 (21:09 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 27 May 2016 01:09:22 +0000 (21:09 -0400)
(This is an "ours" merge to avoid taking the version bump)


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