From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 5 Apr 2019 00:26:47 +0000 (-0400)
Subject: Merge branch 'bug29959_040_squashed' into maint-0.4.0
X-Git-Tag: tor-0.4.0.4-rc~17^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d016bbaa7dfb3586c682c0070b79e174e8a73c19;p=thirdparty%2Ftor.git

Merge branch 'bug29959_040_squashed' into maint-0.4.0
---

d016bbaa7dfb3586c682c0070b79e174e8a73c19