]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 682c154 909aa51)
Merge remote-tracking branch 'sebastian/bug13286'
authorNick Mathewson <nickm@torproject.org>
Mon, 27 Oct 2014 16:12:16 +0000 (12:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 27 Oct 2014 16:12:16 +0000 (12:12 -0400)

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