]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug10063'
authorNick Mathewson <nickm@torproject.org>
Thu, 31 Oct 2013 18:43:20 +0000 (14:43 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 31 Oct 2013 18:43:20 +0000 (14:43 -0400)

Trivial merge