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

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

48d8fe533e977c14983f56de0ca572d842b5aadc