From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 1 Mar 2017 20:39:01 +0000 (-0500)
Subject: Merge branch 'maint-0.3.0'
X-Git-Tag: tor-0.3.1.1-alpha~243
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bc052d49782ec17de9f90a0ec3cf4528afc8c33f;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.0'

"ours" to avoid version bump
---

bc052d49782ec17de9f90a0ec3cf4528afc8c33f