From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 23 Dec 2016 13:28:05 +0000 (-0500)
Subject: Merge remote-tracking branch 'dgoulet/bug19899_030_01'
X-Git-Tag: tor-0.3.0.2-alpha~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fb2bf2f3f5ae63da8e8c043f3f8488a6aad0ded;p=thirdparty%2Ftor.git

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

9fb2bf2f3f5ae63da8e8c043f3f8488a6aad0ded