]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug8059' into maint-0.2.4
authorNick Mathewson <nickm@torproject.org>
Mon, 18 Mar 2013 18:31:50 +0000 (14:31 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 18 Mar 2013 18:31:50 +0000 (14:31 -0400)

Trivial merge