From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 12 Mar 2015 14:05:06 +0000 (-0400)
Subject: Merge branch 'bug9495_redux_v2' into maint-0.2.6
X-Git-Tag: tor-0.2.7.1-alpha~138^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a95e18b3589a2ebc4b9a5c741c37bdf083d5057d;p=thirdparty%2Ftor.git

Merge branch 'bug9495_redux_v2' into maint-0.2.6
---

a95e18b3589a2ebc4b9a5c741c37bdf083d5057d