From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 30 Nov 2017 17:21:36 +0000 (-0500)
Subject: Merge branch 'maint-0.2.5' into maint-0.2.8
X-Git-Tag: tor-0.2.8.17~1^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e219291bee2d378344286ba091ba09527b07188;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.5' into maint-0.2.8

"ours" to avoid version bump
---

2e219291bee2d378344286ba091ba09527b07188