]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/comments-20151213'
authorNick Mathewson <nickm@torproject.org>
Thu, 7 Jan 2016 20:50:10 +0000 (12:50 -0800)
committerNick Mathewson <nickm@torproject.org>
Thu, 7 Jan 2016 20:50:10 +0000 (12:50 -0800)

Trivial merge