]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c5fe7b 59fa0c2)
Merge remote-tracking branch 'origin/maint-0.2.6'
authorNick Mathewson <nickm@torproject.org>
Mon, 15 Jun 2015 14:19:46 +0000 (10:19 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 15 Jun 2015 14:19:46 +0000 (10:19 -0400)

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