From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 15 Feb 2017 12:53:11 +0000 (-0500)
Subject: Merge branch 'maint-0.2.7' into release-0.2.7
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Frelease-0.2.7;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.7' into release-0.2.7
---

e83affb56fa001d1c27f16e30e6c23c88ff165f5