From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 18 Feb 2015 18:29:12 +0000 (-0500)
Subject: Merge branch 'bug13762_diagnostic_redux'
X-Git-Tag: tor-0.2.6.3-alpha~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a767b6664059c1688f3d8e58c1cded367791e97f;p=thirdparty%2Ftor.git

Merge branch 'bug13762_diagnostic_redux'
---

a767b6664059c1688f3d8e58c1cded367791e97f