]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fee289 452cebc)
Merge remote-tracking branch 'yawning/ticket16140'
authorNick Mathewson <nickm@torproject.org>
Thu, 21 May 2015 17:20:24 +0000 (13:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 21 May 2015 17:20:24 +0000 (13:20 -0400)

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