]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6cdb213 8571e86)
Merge remote-tracking branch 'yawning/bug14918'
authorNick Mathewson <nickm@torproject.org>
Wed, 18 Feb 2015 14:21:16 +0000 (09:21 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 18 Feb 2015 14:21:16 +0000 (09:21 -0500)

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