From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 12 Mar 2015 15:37:02 +0000 (-0400)
Subject: Merge branch 'bug15245_026' into maint-0.2.6
X-Git-Tag: tor-0.2.6.5-rc~7^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a1d431cff40dd92e43df892b0369cd12c3596fb;p=thirdparty%2Ftor.git

Merge branch 'bug15245_026' into maint-0.2.6
---

1a1d431cff40dd92e43df892b0369cd12c3596fb