]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55a2bfb 74d710e)
Merge remote-tracking branch 'sebastian/bug20065'
authorNick Mathewson <nickm@torproject.org>
Tue, 6 Sep 2016 14:12:42 +0000 (10:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 6 Sep 2016 14:12:42 +0000 (10:12 -0400)

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