]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug8788'
authorNick Mathewson <nickm@torproject.org>
Wed, 5 Mar 2014 17:17:31 +0000 (12:17 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 5 Mar 2014 17:17:31 +0000 (12:17 -0500)

Trivial merge