From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 29 Mar 2018 18:58:58 +0000 (-0400)
Subject: Merge branch 'bug25617_029' into maint-0.3.3
X-Git-Tag: tor-0.3.3.5-rc~21^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f473fadbd15ededac11feb76c064e49687c3d2b;p=thirdparty%2Ftor.git

Merge branch 'bug25617_029' into maint-0.3.3
---

4f473fadbd15ededac11feb76c064e49687c3d2b