From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 21 Sep 2018 13:33:03 +0000 (-0400)
Subject: Merge remote-tracking branch 'dgoulet/ticket27797_035_01'
X-Git-Tag: tor-0.3.5.3-alpha~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96d1f2e6d0ebcb97aa66a1416d147533b24fac9c;p=thirdparty%2Ftor.git

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

96d1f2e6d0ebcb97aa66a1416d147533b24fac9c