]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug8065_v2'
authorNick Mathewson <nickm@torproject.org>
Tue, 19 Feb 2013 20:02:22 +0000 (15:02 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 19 Feb 2013 20:02:22 +0000 (15:02 -0500)

Trivial merge