From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 31 Jan 2018 21:17:04 +0000 (-0500)
Subject: Merge remote-tracking branch 'dgoulet/ticket24902_029_05'
X-Git-Tag: tor-0.3.3.2-alpha~44
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1c2597096cac27eb9ee842f52384ca4cb28a195;p=thirdparty%2Ftor.git

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

d1c2597096cac27eb9ee842f52384ca4cb28a195