From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 25 Oct 2017 13:28:15 +0000 (-0400)
Subject: Merge branch 'maint-0.2.5' into maint-0.2.8
X-Git-Tag: tor-0.2.8.17~7^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=faf568fa7e8cfbebc236b6aef743251b7e6b9df4;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.5' into maint-0.2.8

"ours" merge to avoid version bump
---

faf568fa7e8cfbebc236b6aef743251b7e6b9df4