From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 19 Jan 2018 21:30:53 +0000 (-0500)
Subject: Merge branch 'maint-0.3.0' into release-0.3.0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Frelease-0.3.0;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.0' into release-0.3.0
---

d07e069c97ac5f9e0c9a593b7ec84c540b310f0f