From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 5 Apr 2018 12:20:15 +0000 (-0400)
Subject: Merge branch 'bug25679_033_squashed' into maint-0.3.3
X-Git-Tag: tor-0.3.3.5-rc~16^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f798b686d0d699c55a20ef19fe57dd487b3aa69;p=thirdparty%2Ftor.git

Merge branch 'bug25679_033_squashed' into maint-0.3.3
---

8f798b686d0d699c55a20ef19fe57dd487b3aa69