]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 57699de af88e8f)
Merge remote-tracking branch 'teor/bug17193'
authorNick Mathewson <nickm@torproject.org>
Sun, 28 Feb 2016 14:22:56 +0000 (15:22 +0100)
committerNick Mathewson <nickm@torproject.org>
Sun, 28 Feb 2016 14:22:56 +0000 (15:22 +0100)

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