From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 31 Oct 2017 16:14:21 +0000 (-0400)
Subject: Merge branch 'bug23762_032_02_squashed' into maint-0.3.2
X-Git-Tag: tor-0.3.2.4-alpha~27^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d93ec3ef418b13b1f8ae90436429e1941540f0f;p=thirdparty%2Ftor.git

Merge branch 'bug23762_032_02_squashed' into maint-0.3.2
---

3d93ec3ef418b13b1f8ae90436429e1941540f0f