From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 3 Apr 2017 13:38:27 +0000 (-0400)
Subject: Merge branch 'maint-0.3.0'
X-Git-Tag: tor-0.3.1.1-alpha~192
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ffad41e9d8698aa0111f76fe3c81be1da6b985d6;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.0'

("Ours" merge to avoid version bump.)
---

ffad41e9d8698aa0111f76fe3c81be1da6b985d6