From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 11 Jan 2018 17:28:29 +0000 (-0500)
Subject: Merge branch 'bug24584'
X-Git-Tag: tor-0.3.3.1-alpha~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d0adf5ae952d303dcd1d6ff06e523580c8055ece;p=thirdparty%2Ftor.git

Merge branch 'bug24584'
---

d0adf5ae952d303dcd1d6ff06e523580c8055ece