From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 31 Jan 2018 14:47:36 +0000 (-0500)
Subject: Merge branch 'bug24927'
X-Git-Tag: tor-0.3.3.2-alpha~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=914ec372a9352308c3990afb5304f7e8d39b1020;p=thirdparty%2Ftor.git

Merge branch 'bug24927'
---

914ec372a9352308c3990afb5304f7e8d39b1020