From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 19 Sep 2017 17:36:43 +0000 (-0400)
Subject: Merge branch 'ticket21405'
X-Git-Tag: tor-0.3.2.2-alpha~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a2caa466eed1715603ece5bd7e74536f834e075e;p=thirdparty%2Ftor.git

Merge branch 'ticket21405'
---

a2caa466eed1715603ece5bd7e74536f834e075e