]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 52b2b2c 0fa3811)
Merge branch 'maint-0.2.8'
authorNick Mathewson <nickm@torproject.org>
Mon, 17 Oct 2016 18:57:44 +0000 (14:57 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 17 Oct 2016 18:57:44 +0000 (14:57 -0400)
("ours" merge to avoid taking version bump)


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