]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/comments-20151204'
authorNick Mathewson <nickm@torproject.org>
Mon, 7 Dec 2015 15:13:20 +0000 (10:13 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 7 Dec 2015 15:13:20 +0000 (10:13 -0500)

Trivial merge