From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 11 May 2016 16:22:36 +0000 (-0400)
Subject: Merge branch 'bug18841_1_025' into maint-0.2.7
X-Git-Tag: tor-0.2.8.3-alpha~34^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=039fc8427a512efce87b7bd21c10c4adca4ba30d;p=thirdparty%2Ftor.git

Merge branch 'bug18841_1_025' into maint-0.2.7
---

039fc8427a512efce87b7bd21c10c4adca4ba30d