]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug8012'
authorNick Mathewson <nickm@torproject.org>
Tue, 22 Jan 2013 14:54:30 +0000 (14:54 +0000)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 Jan 2013 14:54:30 +0000 (14:54 +0000)

Trivial merge