From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 2 Feb 2017 14:07:20 +0000 (-0500)
Subject: Merge remote-tracking branch 'dgoulet/bug21294_030_02'
X-Git-Tag: tor-0.3.0.3-alpha~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96dce88d80f422914eb93a7236e5dc1eaed4cfb6;p=thirdparty%2Ftor.git

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

96dce88d80f422914eb93a7236e5dc1eaed4cfb6