From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 25 Mar 2016 20:28:33 +0000 (-0400)
Subject: Merge branch 'bug18626_027'
X-Git-Tag: tor-0.2.8.2-alpha~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=049445bca33e8578757639fc8a236540fd0fd154;p=thirdparty%2Ftor.git

Merge branch 'bug18626_027'
---

049445bca33e8578757639fc8a236540fd0fd154