From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 13 Apr 2017 13:38:59 +0000 (-0400)
Subject: Merge remote-tracking branch 'dgoulet/ticket21919_031_01'
X-Git-Tag: tor-0.3.1.1-alpha~165
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28ec2d9c2cbb300af8ba467898626020add977c4;p=thirdparty%2Ftor.git

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

28ec2d9c2cbb300af8ba467898626020add977c4