From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 18 Jan 2017 14:10:46 +0000 (-0500)
Subject: Merge remote-tracking branch 'dgoulet/bug19953_030_01'
X-Git-Tag: tor-0.3.0.2-alpha~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69cb6f34cb87b0b2ba23d84cf19163cb5c9f4929;p=thirdparty%2Ftor.git

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

69cb6f34cb87b0b2ba23d84cf19163cb5c9f4929