From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 4 Dec 2017 20:56:17 +0000 (-0500)
Subject: Merge branch 'ticket24518'
X-Git-Tag: tor-0.3.3.1-alpha~164
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5822496d69f670766b97b59bf3b2963d9bd6f37f;p=thirdparty%2Ftor.git

Merge branch 'ticket24518'
---

5822496d69f670766b97b59bf3b2963d9bd6f37f