From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 8 May 2014 02:15:24 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug8387_diagnostic'
X-Git-Tag: tor-0.2.5.5-alpha~85
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0de2625675c9b504a40312ef190bf8b184cc9ce0;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/bug8387_diagnostic'
---

0de2625675c9b504a40312ef190bf8b184cc9ce0