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

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

e8624b72a83074e00859581c34c23d4779f00010