From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 22 Mar 2016 14:08:50 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug18253'
X-Git-Tag: tor-0.2.8.2-alpha~41
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca8423a703803db860ee39906f8b5d362e0f64f2;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/bug18253'
---

ca8423a703803db860ee39906f8b5d362e0f64f2