]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c820de 353d2fe)
Merge remote-tracking branch 'sebastian/bug14819'
authorNick Mathewson <nickm@torproject.org>
Wed, 11 Feb 2015 13:40:48 +0000 (08:40 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 11 Feb 2015 13:40:48 +0000 (08:40 -0500)

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