]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug8151'
authorNick Mathewson <nickm@torproject.org>
Tue, 5 Feb 2013 05:33:04 +0000 (00:33 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 5 Feb 2013 05:33:04 +0000 (00:33 -0500)

Trivial merge