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

Merge branch 'maint-0.2.8' into release-0.2.8
---

89f40ba97a752f125ef7dbb057d64dd5e06a95db