]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c1c71a 0a74346)
Merge branch 'maint-0.2.8'
authorNick Mathewson <nickm@torproject.org>
Thu, 26 May 2016 16:30:03 +0000 (12:30 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 26 May 2016 16:30:03 +0000 (12:30 -0400)
(Ours merge, to avoid taking version bump)


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