From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 3 Nov 2016 18:35:03 +0000 (-0400)
Subject: Merge remote-tracking branch 'dgoulet/bug20376_030_01'
X-Git-Tag: tor-0.3.0.1-alpha~184
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40487b0141096ddb40bec38f7d1c6a4367d8c279;p=thirdparty%2Ftor.git

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

40487b0141096ddb40bec38f7d1c6a4367d8c279