]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8fe499 e9463b0)
Merge remote-tracking branch 'public/bug12985_024' into bug12985_025
authorNick Mathewson <nickm@torproject.org>
Wed, 7 Jan 2015 16:54:33 +0000 (11:54 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 7 Jan 2015 16:54:33 +0000 (11:54 -0500)

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