From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 8 Jun 2018 14:17:00 +0000 (-0400)
Subject: Merge remote-tracking branch 'mikeperry-github/bug26259'
X-Git-Tag: tor-0.3.4.2-alpha~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f399887cfec8ddaf33cac06b2abad25a3d42aac9;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'mikeperry-github/bug26259'
---

f399887cfec8ddaf33cac06b2abad25a3d42aac9