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

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

683b80bf815814f8c13f627aadc92267d009693e