]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc1943b 6f9e901)
Merge remote-tracking branch 'special/bug16060'
authorNick Mathewson <nickm@torproject.org>
Mon, 18 May 2015 15:56:16 +0000 (11:56 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 18 May 2015 15:56:16 +0000 (11:56 -0400)

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