From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 5 Apr 2018 12:22:33 +0000 (-0400)
Subject: Merge branch 'maint-0.2.5' into release-0.2.5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Frelease-0.2.5;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.5' into release-0.2.5
---

279fa65d34bbb41d1428eb62f6172b218598644e