From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 3 May 2018 20:48:03 +0000 (-0400)
Subject: Merge remote-tracking branch 'dgoulet/ticket25914_034_01'
X-Git-Tag: tor-0.3.4.1-alpha~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80b9a589bb351659252faa9793176ada6c9ce914;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'dgoulet/ticket25914_034_01'
---

80b9a589bb351659252faa9793176ada6c9ce914