]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 05e2750 3a0d42f)
Merge branch 'maint-0.2.8'
authorNick Mathewson <nickm@torproject.org>
Wed, 15 Jun 2016 00:36:54 +0000 (20:36 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 15 Jun 2016 00:36:54 +0000 (20:36 -0400)
This is an "ours" merge to avoid taking a version bump.


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