From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 2 May 2018 12:45:35 +0000 (-0400)
Subject: Merge branch 'ticket25996'
X-Git-Tag: tor-0.3.4.1-alpha~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f26d6ead21015b7ba6f7d72ebfc2ebf29da0863b;p=thirdparty%2Ftor.git

Merge branch 'ticket25996'
---

f26d6ead21015b7ba6f7d72ebfc2ebf29da0863b