]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0696ac5 2e980e9)
Merge remote-tracking branch 'rl1987/ticket16831_part2_rebased'
authorNick Mathewson <nickm@torproject.org>
Fri, 30 Oct 2015 13:59:11 +0000 (09:59 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 30 Oct 2015 13:59:11 +0000 (09:59 -0400)

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