From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 21 Sep 2018 13:35:23 +0000 (-0400)
Subject: Merge branch 'maint-0.3.2' into release-0.3.2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Frelease-0.3.2;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.2' into release-0.3.2
---

bf2ffd39781664b6b29a57a1dd1d110368f120ce