From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 14 Feb 2018 15:03:14 +0000 (-0500)
Subject: Merge remote-tracking branch 'mikeperry/bug24769'
X-Git-Tag: tor-0.3.4.0-alpha-dev~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f6a230ec9555688d61db37eb22c8823619332d83;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'mikeperry/bug24769'
---

f6a230ec9555688d61db37eb22c8823619332d83