]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5a0c94f b330bde)
Merge remote-tracking branch 'yawning/bug14740'
authorNick Mathewson <nickm@torproject.org>
Thu, 5 Feb 2015 15:59:44 +0000 (10:59 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 5 Feb 2015 15:59:44 +0000 (10:59 -0500)

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