From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 2 Jan 2018 14:37:23 +0000 (-0500)
Subject: Merge remote-tracking branch 'ffmancera/github/bug24677'
X-Git-Tag: tor-0.3.3.1-alpha~85
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5051cfe9bd66aa68c6825c00e107f759c921a9ff;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'ffmancera/github/bug24677'
---

5051cfe9bd66aa68c6825c00e107f759c921a9ff