From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 8 Jun 2017 18:06:49 +0000 (-0400)
Subject: Merge branch 'maint-0.3.0'
X-Git-Tag: tor-0.3.1.4-alpha~48
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f4d3de80c6de40dc4c7face055ec6d3abf3ed27;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.0'

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

4f4d3de80c6de40dc4c7face055ec6d3abf3ed27