From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 1 Aug 2017 15:19:29 +0000 (-0400)
Subject: Merge branch 'maint-0.2.7-redux' into release-0.2.7-redux
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Frelease-0.2.7-redux;p=thirdparty%2Ftor.git

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

b05bb04a829250d795e4e81c9228dff57cbad7a5