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

Merge branch 'maint-0.2.6' into release-0.2.6
---

3ae8b32cc97431ff29f1a0dab2b30c7f35038ac9