From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 5 Apr 2017 14:04:42 +0000 (-0400)
Subject: Merge branch 'maint-0.3.0'
X-Git-Tag: tor-0.3.1.1-alpha~186
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e5e5ba64bab49d056814bc933ab3c4c0a0f5a74;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.0'

"ours" merge to avoid the version bump.
---

0e5e5ba64bab49d056814bc933ab3c4c0a0f5a74