]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 33b399a c8132aa)
Merge remote-tracking branch 'yawning/bug13314'
authorNick Mathewson <nickm@torproject.org>
Thu, 16 Oct 2014 13:12:13 +0000 (09:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 16 Oct 2014 13:12:13 +0000 (09:12 -0400)

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